skuba 14.0.0-hacky-hack-lang-json-20260109063709 → 14.0.0-hacky-hack-lang-json-20260109075700
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cli/lint/internalLints/upgrade/patches/13.1.1/patchRootTsconfig.js +13 -5
- package/lib/cli/lint/internalLints/upgrade/patches/13.1.1/patchRootTsconfig.js.map +2 -2
- package/package.json +3 -3
- package/template/greeter/package.json +2 -2
- package/template/lambda-sqs-worker-cdk/package.json +2 -2
|
@@ -39,7 +39,6 @@ var import_napi = require("@ast-grep/napi");
|
|
|
39
39
|
var import_fs_extra = __toESM(require("fs-extra"));
|
|
40
40
|
var import_exec = require("../../../../../../utils/exec.js");
|
|
41
41
|
var import_logging = require("../../../../../../utils/logging.js");
|
|
42
|
-
var import_manifest = require("../../../../../../utils/manifest.js");
|
|
43
42
|
const patchRootConfig = async ({
|
|
44
43
|
mode
|
|
45
44
|
}) => {
|
|
@@ -53,11 +52,20 @@ const patchRootConfig = async ({
|
|
|
53
52
|
};
|
|
54
53
|
}
|
|
55
54
|
try {
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
55
|
+
const treeSitterCliDir = import_path.default.dirname(
|
|
56
|
+
require.resolve("tree-sitter-cli/package.json")
|
|
57
|
+
);
|
|
58
|
+
const treeSitterExec = (0, import_exec.createExec)({
|
|
59
|
+
cwd: treeSitterCliDir
|
|
60
|
+
});
|
|
61
|
+
await treeSitterExec("node", "run", "install");
|
|
62
|
+
const astGrepJsonDir = import_path.default.dirname(
|
|
63
|
+
require.resolve("@ast-grep/lang-json/package.json")
|
|
64
|
+
);
|
|
65
|
+
const astGrepExec = (0, import_exec.createExec)({
|
|
66
|
+
cwd: astGrepJsonDir
|
|
59
67
|
});
|
|
60
|
-
await
|
|
68
|
+
await astGrepExec("node", "run", "postinstall");
|
|
61
69
|
} catch (err) {
|
|
62
70
|
import_logging.log.warn(
|
|
63
71
|
"Failed to run @ast-grep/lang-json postinstall step, AST parsing may fail"
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/13.1.1/patchRootTsconfig.ts"],
|
|
4
|
-
"sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport json from '@ast-grep/lang-json';\nimport { parseAsync, registerDynamicLanguage } from '@ast-grep/napi';\nimport fs from 'fs-extra';\n\nimport { createExec } from '../../../../../../utils/exec.js';\nimport { log } from '../../../../../../utils/logging.js';\nimport
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAwB;AAExB,uBAAiB;AACjB,kBAAoD;AACpD,sBAAe;AAEf,kBAA2B;AAC3B,qBAAoB;
|
|
4
|
+
"sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport json from '@ast-grep/lang-json';\nimport { parseAsync, registerDynamicLanguage } from '@ast-grep/napi';\nimport fs from 'fs-extra';\n\nimport { createExec } from '../../../../../../utils/exec.js';\nimport { log } from '../../../../../../utils/logging.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nexport const patchRootConfig: PatchFunction = async ({\n mode,\n}): Promise<PatchReturnType> => {\n let tsconfigFile: string;\n try {\n tsconfigFile = await fs.promises.readFile('tsconfig.json', 'utf8');\n } catch {\n return {\n result: 'skip',\n reason: 'no root tsconfig.json found',\n };\n }\n\n // @ast-grep/json requires a postinstall step to build the native bindings\n // which may not have run in alpine due to pnpm not trusting scripts by default\n try {\n const treeSitterCliDir = path.dirname(\n require.resolve('tree-sitter-cli/package.json'),\n );\n const treeSitterExec = createExec({\n cwd: treeSitterCliDir,\n });\n await treeSitterExec('node', 'run', 'install');\n\n const astGrepJsonDir = path.dirname(\n require.resolve('@ast-grep/lang-json/package.json'),\n );\n const astGrepExec = createExec({\n cwd: astGrepJsonDir,\n });\n await astGrepExec('node', 'run', 'postinstall');\n } catch (err) {\n log.warn(\n 'Failed to run @ast-grep/lang-json postinstall step, AST parsing may fail',\n );\n log.subtle(inspect(err));\n }\n\n registerDynamicLanguage({ json });\n const tsconfig = await parseAsync('json', tsconfigFile);\n const ast = tsconfig.root();\n\n const compilerOptionsObj = ast.find({\n rule: {\n pattern: {\n context: '{\"compilerOptions\":}',\n selector: 'pair',\n },\n },\n });\n\n if (!compilerOptionsObj) {\n const startingBracket = ast.find({ rule: { pattern: '{' } });\n\n if (!startingBracket) {\n return {\n result: 'skip',\n reason: 'Unable to parse tsconfig.json',\n };\n }\n\n const edit = startingBracket.replace(\n `{\n \"compilerOptions\": {\n \"rootDir\": \".\"\n },`,\n );\n\n const newSource = ast.commitEdits([edit]);\n\n if (mode === 'lint') {\n return {\n result: 'apply',\n };\n }\n\n await fs.promises.writeFile('tsconfig.json', newSource, 'utf8');\n\n return {\n result: 'apply',\n };\n }\n\n const rootDirOption = compilerOptionsObj.find({\n rule: { pattern: '\"rootDir\"' },\n });\n\n if (rootDirOption) {\n return {\n result: 'skip',\n reason: 'rootDir already set in tsconfig.json',\n };\n }\n\n const compilerOptionsStart = compilerOptionsObj.find({\n rule: { pattern: '{' },\n });\n\n if (!compilerOptionsStart) {\n return {\n result: 'skip',\n reason: 'Unable to parse tsconfig.json compilerOptions',\n };\n }\n\n const edit = compilerOptionsStart.replace(`{\n \"rootDir\": \".\",`);\n\n const newSource = ast.commitEdits([edit]);\n\n if (mode === 'lint') {\n return {\n result: 'apply',\n };\n }\n\n await fs.promises.writeFile('tsconfig.json', newSource, 'utf8');\n\n return {\n result: 'apply',\n };\n};\n\nexport const tryPatchRootTsConfig: PatchFunction = async (config) => {\n try {\n return await patchRootConfig(config);\n } catch (err) {\n log.warn('Failed to patch root `tsconfig.json`');\n log.subtle(inspect(err));\n return { result: 'skip', reason: 'due to an error' };\n }\n};\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["fs", "path", "json", "edit", "newSource"]
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "skuba",
|
|
3
|
-
"version": "14.0.0-hacky-hack-lang-json-
|
|
3
|
+
"version": "14.0.0-hacky-hack-lang-json-20260109075700",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "SEEK development toolkit for backend applications and packages",
|
|
6
6
|
"homepage": "https://github.com/seek-oss/skuba#readme",
|
|
@@ -103,8 +103,8 @@
|
|
|
103
103
|
"tsx": "^4.21.0",
|
|
104
104
|
"typescript": "~5.9.0",
|
|
105
105
|
"zod": "^4.0.0",
|
|
106
|
-
"@skuba-lib/api": "^2.0.0-hacky-hack-lang-json-
|
|
107
|
-
"eslint-config-skuba": "8.0.0-hacky-hack-lang-json-
|
|
106
|
+
"@skuba-lib/api": "^2.0.0-hacky-hack-lang-json-20260109075700",
|
|
107
|
+
"eslint-config-skuba": "8.0.0-hacky-hack-lang-json-20260109075700"
|
|
108
108
|
},
|
|
109
109
|
"devDependencies": {
|
|
110
110
|
"@changesets/cli": "2.29.8",
|
|
@@ -19,11 +19,11 @@
|
|
|
19
19
|
"test:watch": "skuba test --watch"
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"skuba-dive": "4.0.0-hacky-hack-lang-json-
|
|
22
|
+
"skuba-dive": "4.0.0-hacky-hack-lang-json-20260109075700"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"@types/node": "^22.13.10",
|
|
26
|
-
"skuba": "14.0.0-hacky-hack-lang-json-
|
|
26
|
+
"skuba": "14.0.0-hacky-hack-lang-json-20260109075700"
|
|
27
27
|
},
|
|
28
28
|
"packageManager": "pnpm@10.27.0",
|
|
29
29
|
"engines": {
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"@aws-sdk/client-sns": "^3.363.0",
|
|
25
25
|
"@seek/aws-codedeploy-hooks": "^2.0.0",
|
|
26
26
|
"@seek/logger": "^11.1.0",
|
|
27
|
-
"skuba-dive": "4.0.0-hacky-hack-lang-json-
|
|
27
|
+
"skuba-dive": "4.0.0-hacky-hack-lang-json-20260109075700",
|
|
28
28
|
"zod": "^4.0.0"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"datadog-lambda-js": "^12.0.0",
|
|
43
43
|
"dd-trace": "^5.0.0",
|
|
44
44
|
"pino-pretty": "^13.0.0",
|
|
45
|
-
"skuba": "14.0.0-hacky-hack-lang-json-
|
|
45
|
+
"skuba": "14.0.0-hacky-hack-lang-json-20260109075700"
|
|
46
46
|
},
|
|
47
47
|
"packageManager": "pnpm@10.27.0",
|
|
48
48
|
"engines": {
|