Compare commits
	
		
			24 Commits
		
	
	
		
			v4-develop
			...
			6236265f1a
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 6236265f1a | |||
| 7233ced080 | |||
| d78cb4e50d | |||
| 8a441d757e | |||
| 6ac1015718 | |||
| f20c2b24f0 | |||
| 113445ca43 | |||
| bdb7851064 | |||
| cdb30f2dc0 | |||
| fb8bfa6a9c | |||
| 79adf18d9a | |||
| 7ce71dfca8 | |||
| 3bcd4f3f6d | |||
| d4ef1c70e0 | |||
| c9e107d2fd | |||
| b6b4f2e5b8 | |||
| 432593a0f3 | |||
| 6629caf459 | |||
| 8bcc99b898 | |||
| 05694ed022 | |||
| 67bd712590 | |||
| a90482de8c | |||
| 261bbee1a4 | |||
| fcf492c661 | 
@@ -13,7 +13,7 @@ executors:
 | 
				
			|||||||
  nodejs:
 | 
					  nodejs:
 | 
				
			||||||
    docker:
 | 
					    docker:
 | 
				
			||||||
      - image: node:18
 | 
					      - image: node:18
 | 
				
			||||||
    resource_class: medium
 | 
					    resource_class: large
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
@@ -23,11 +23,9 @@ jobs:
 | 
				
			|||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - checkout:
 | 
					      - checkout:
 | 
				
			||||||
          path: ~/scwrypts
 | 
					          path: ~/scwrypts
 | 
				
			||||||
      - run:
 | 
					      - run: |
 | 
				
			||||||
          name: pytest
 | 
					 | 
				
			||||||
          command: |
 | 
					 | 
				
			||||||
          : \
 | 
					          : \
 | 
				
			||||||
              && pip install . .[test] \
 | 
					            && pip install -e . \
 | 
				
			||||||
            && pytest \
 | 
					            && pytest \
 | 
				
			||||||
            ;
 | 
					            ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -68,7 +66,6 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
      - run: pnpm test
 | 
					      - run: pnpm test
 | 
				
			||||||
      - run: pnpm lint
 | 
					      - run: pnpm lint
 | 
				
			||||||
      - run: pnpm build
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  nodejs-publish:
 | 
					  nodejs-publish:
 | 
				
			||||||
    executor: nodejs
 | 
					    executor: nodejs
 | 
				
			||||||
@@ -96,16 +93,9 @@ jobs:
 | 
				
			|||||||
          paths:
 | 
					          paths:
 | 
				
			||||||
            - .pnpm-store
 | 
					            - .pnpm-store
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - run:
 | 
					      - run: pnpm build
 | 
				
			||||||
          name: publish
 | 
					      - run: pnpm version $(git describe --tags)
 | 
				
			||||||
          command: |
 | 
					
 | 
				
			||||||
            : \
 | 
					 | 
				
			||||||
              && [ $CIRCLE_TAG ] \
 | 
					 | 
				
			||||||
              && pnpm build \
 | 
					 | 
				
			||||||
              && pnpm version $(git describe --tags) \
 | 
					 | 
				
			||||||
              && pnpm set //registry.npmjs.org/:_authToken=$NPM_TOKEN \
 | 
					 | 
				
			||||||
              && pnpm publish --no-git-checks \
 | 
					 | 
				
			||||||
              ;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
workflows:
 | 
					workflows:
 | 
				
			||||||
  python:
 | 
					  python:
 | 
				
			||||||
@@ -113,21 +103,15 @@ workflows:
 | 
				
			|||||||
      - python-test
 | 
					      - python-test
 | 
				
			||||||
      - python-publish:
 | 
					      - python-publish:
 | 
				
			||||||
          requires: [python-test]
 | 
					          requires: [python-test]
 | 
				
			||||||
          context: [pypi-yage]
 | 
					 | 
				
			||||||
          filters:
 | 
					          filters:
 | 
				
			||||||
            tags:
 | 
					 | 
				
			||||||
              only: /^v.*$/
 | 
					 | 
				
			||||||
            branches:
 | 
					            branches:
 | 
				
			||||||
              ignore: /^.*$/
 | 
					              only: main
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  nodejs:
 | 
					  nodejs:
 | 
				
			||||||
    jobs:
 | 
					    jobs:
 | 
				
			||||||
      - nodejs-test
 | 
					      - nodejs-test
 | 
				
			||||||
      - nodejs-publish:
 | 
					      - nodejs-publish:
 | 
				
			||||||
          requires: [nodejs-test]
 | 
					          requires: [nodejs-test]
 | 
				
			||||||
          context: [npm-wrynegade]
 | 
					 | 
				
			||||||
          filters:
 | 
					          filters:
 | 
				
			||||||
            tags:
 | 
					 | 
				
			||||||
              only: /^v.*$/
 | 
					 | 
				
			||||||
            branches:
 | 
					            branches:
 | 
				
			||||||
              ignore: /^.*$/
 | 
					              only: main
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,7 +26,6 @@
 | 
				
			|||||||
		"prettier": "^3.2.5",
 | 
							"prettier": "^3.2.5",
 | 
				
			||||||
		"ts-jest": "^29.1.2",
 | 
							"ts-jest": "^29.1.2",
 | 
				
			||||||
		"ts-node": "^10.9.2",
 | 
							"ts-node": "^10.9.2",
 | 
				
			||||||
		"typescript": "^5.3.3",
 | 
					 | 
				
			||||||
		"uuid": "^9.0.1"
 | 
							"uuid": "^9.0.1"
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
	"eslintConfig": {
 | 
						"eslintConfig": {
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										3
									
								
								zx/lib/pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										3
									
								
								zx/lib/pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							@@ -43,9 +43,6 @@ devDependencies:
 | 
				
			|||||||
  ts-node:
 | 
					  ts-node:
 | 
				
			||||||
    specifier: ^10.9.2
 | 
					    specifier: ^10.9.2
 | 
				
			||||||
    version: 10.9.2(@types/node@20.11.19)(typescript@5.3.3)
 | 
					    version: 10.9.2(@types/node@20.11.19)(typescript@5.3.3)
 | 
				
			||||||
  typescript:
 | 
					 | 
				
			||||||
    specifier: ^5.3.3
 | 
					 | 
				
			||||||
    version: 5.3.3
 | 
					 | 
				
			||||||
  uuid:
 | 
					  uuid:
 | 
				
			||||||
    specifier: ^9.0.1
 | 
					    specifier: ^9.0.1
 | 
				
			||||||
    version: 9.0.1
 | 
					    version: 9.0.1
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -64,9 +64,11 @@ afterEach(() => {
 | 
				
			|||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
describe('exact lookup', () => {
 | 
					describe('exact lookup', () => {
 | 
				
			||||||
 | 
					  let output;
 | 
				
			||||||
  beforeEach(async () => {
 | 
					  beforeEach(async () => {
 | 
				
			||||||
    sample.spy.getScwryptsLookup.mockReturnValue(sample.lookup.exact);
 | 
					    sample.spy.getScwryptsLookup.mockReturnValue(sample.lookup.exact);
 | 
				
			||||||
    await scwrypts(sample.options);
 | 
					
 | 
				
			||||||
 | 
					    output = await scwrypts(sample.options);
 | 
				
			||||||
  });
 | 
					  });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  test('gets the correct lookup', () => {
 | 
					  test('gets the correct lookup', () => {
 | 
				
			||||||
@@ -96,6 +98,7 @@ describe('exact lookup', () => {
 | 
				
			|||||||
describe('patterns lookup', () => {
 | 
					describe('patterns lookup', () => {
 | 
				
			||||||
  beforeEach(async () => {
 | 
					  beforeEach(async () => {
 | 
				
			||||||
    sample.spy.getScwryptsLookup.mockReturnValue(sample.lookup.patterns);
 | 
					    sample.spy.getScwryptsLookup.mockReturnValue(sample.lookup.patterns);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    await scwrypts(sample.options);
 | 
					    await scwrypts(sample.options);
 | 
				
			||||||
  });
 | 
					  });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user