From 069d4627d468cb0b4dffa329f7f5bec520fe5a6f Mon Sep 17 00:00:00 2001 From: Miles Bardon Date: Fri, 30 Jun 2023 11:37:33 +0100 Subject: [PATCH 1/6] fix: Adding reference if field.reference_to is not an array --- src/lib/tsgen/factory.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/tsgen/factory.ts b/src/lib/tsgen/factory.ts index f452b6e..588a3f0 100644 --- a/src/lib/tsgen/factory.ts +++ b/src/lib/tsgen/factory.ts @@ -291,6 +291,8 @@ export default function (userOptions: TSGenOptions) { field.reference_to.forEach(v => { references.push(name_type(v)) }) + } else { + references.push(field.reference_to) } return ['(', references.join(' | '), ')', '[]'].join('') From 3ed3989022e6bc162591ddac39e85b5b5dfdd06f Mon Sep 17 00:00:00 2001 From: Miles Bardon Date: Fri, 30 Jun 2023 11:38:00 +0100 Subject: [PATCH 2/6] fix: Fetching all content types above 100 --- src/lib/stack/client.ts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/lib/stack/client.ts b/src/lib/stack/client.ts index b04f545..b74173c 100644 --- a/src/lib/stack/client.ts +++ b/src/lib/stack/client.ts @@ -28,11 +28,20 @@ export async function stackConnect(client: any, config: StackConnectionConfig) { config.region ) - const results = await stack.getContentTypes({ - include_global_field_schema: true, - }) + let count = 0 + const types = [] + + do { + // eslint-disable-next-line no-await-in-loop + const result: {content_types: any[]; count: number} = await stack.getContentTypes({ + include_global_field_schema: true, + include_count: true, + skip: types.length, + }) - const types = results.content_types + count = result.count + types.push(...result.content_types) + } while (types.length < count) if (stack) { return { From 3d7174eef1f6234e5738bc984d000d1ac5892cd1 Mon Sep 17 00:00:00 2001 From: Miles Bardon Date: Fri, 30 Jun 2023 12:04:12 +0100 Subject: [PATCH 3/6] fix: Fixing name_type in type_reference --- src/lib/tsgen/factory.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/tsgen/factory.ts b/src/lib/tsgen/factory.ts index 588a3f0..3e6a398 100644 --- a/src/lib/tsgen/factory.ts +++ b/src/lib/tsgen/factory.ts @@ -292,7 +292,7 @@ export default function (userOptions: TSGenOptions) { references.push(name_type(v)) }) } else { - references.push(field.reference_to) + references.push(name_type(field.reference_to)) } return ['(', references.join(' | '), ')', '[]'].join('') From ae9f3e0e09fce9b971de463eee9d1eaf57671996 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Mon, 3 Jul 2023 17:44:11 +0530 Subject: [PATCH 4/6] changed node-version to 18.x in workflow --- .github/workflows/node.js.yml | 2 +- .github/workflows/release.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index fc20328..81fdcba 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [18.x,20.x] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1d93bed..7074040 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v1 with: - node-version: 16 + node-version: '18.x' - name: Install dependencies run: npm install - name: Build @@ -38,7 +38,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v1 with: - node-version: 16 + node-version: '18.x' - name: Install dependencies run: npm install - name: Download dist From da581685093979df79603832d4046f9d2c32819e Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Wed, 5 Jul 2023 13:15:44 +0100 Subject: [PATCH 5/6] fix: bumped version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f028be5..6e1b54d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "contentstack-cli-tsgen", "description": "Generate TypeScript typings from a Stack.", - "version": "2.1.3", + "version": "2.1.4", "author": "Michael Davis", "bugs": "https://github.com/Contentstack-Solutions/contentstack-cli-tsgen/issues", "dependencies": { From 0b2af21d3e557f8d93818c8abe40dc7609fcdb03 Mon Sep 17 00:00:00 2001 From: Netraj Patel Date: Thu, 6 Jul 2023 19:04:33 +0530 Subject: [PATCH 6/6] Added sast and secret scan workflows --- .github/workflows/sast-scan.yml | 11 +++++++++++ .github/workflows/secrets-scan.yml | 11 +++++++++++ package-lock.json | 8 ++++---- package.json | 4 ++-- 4 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/sast-scan.yml create mode 100644 .github/workflows/secrets-scan.yml diff --git a/.github/workflows/sast-scan.yml b/.github/workflows/sast-scan.yml new file mode 100644 index 0000000..ed714ef --- /dev/null +++ b/.github/workflows/sast-scan.yml @@ -0,0 +1,11 @@ +name: SAST Scan +on: + pull_request: + types: [opened, synchronize, reopened] +jobs: + security: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Horusec Scan + run: docker run -v /var/run/docker.sock:/var/run/docker.sock -v $(pwd):/src horuszup/horusec-cli:latest horusec start -p /src -P $(pwd) diff --git a/.github/workflows/secrets-scan.yml b/.github/workflows/secrets-scan.yml new file mode 100644 index 0000000..0fc4fbb --- /dev/null +++ b/.github/workflows/secrets-scan.yml @@ -0,0 +1,11 @@ +name: Secrets Scan +on: + pull_request: + types: [opened, synchronize, reopened] +jobs: + security: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Gittyleaks + uses: gupy-io/gittyleaks-action@v0.1 diff --git a/package-lock.json b/package-lock.json index dc309e3..b0c7f6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,16 @@ { "name": "contentstack-cli-tsgen", - "version": "2.1.3", + "version": "2.1.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "contentstack-cli-tsgen", - "version": "2.1.3", + "version": "2.1.4", "license": "MIT", "dependencies": { - "@contentstack/cli-command": "^1.2.7", - "@contentstack/cli-utilities": "^1.4.3", + "@contentstack/cli-command": "^1.2.9", + "@contentstack/cli-utilities": "^1.4.5", "lodash": "^4.17.20", "prettier": "^2.0.5", "tslib": "^1.13.0" diff --git a/package.json b/package.json index 6e1b54d..7bd1c71 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "author": "Michael Davis", "bugs": "https://github.com/Contentstack-Solutions/contentstack-cli-tsgen/issues", "dependencies": { - "@contentstack/cli-command": "^1.2.7", - "@contentstack/cli-utilities": "^1.4.3", + "@contentstack/cli-command": "^1.2.9", + "@contentstack/cli-utilities": "^1.4.5", "lodash": "^4.17.20", "prettier": "^2.0.5", "tslib": "^1.13.0"