fixes

pyramation · pyramation · commit ee3507fdad4f · 2025-11-22T17:41:16.000-08:00
diff --git a/package.json b/package.json
@@ -18,24 +18,25 @@
     "build": "pnpm -r run build",
     "clean": "pnpm -r run clean",
     "test": "pnpm -r run test",
-    "lint": "pnpm -r run lint"
+    "lint": "pnpm -r run lint",
+    "deps": "pnpm up -r -i -L"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
     "@types/node": "^22.10.2",
     "@typescript-eslint/eslint-plugin": "^8.15.0",
     "@typescript-eslint/parser": "^8.15.0",
-    "eslint": "^9.13.0",
     "cpy-cli": "^6.0.0",
-    "rimraf": "4.4.1",
+    "eslint": "^9.13.0",
     "eslint-config-prettier": "^10.1.1",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unused-imports": "^4.3.0",
-    "jest": "^29.7.0",
+    "jest": "^30.2.0",
     "lerna": "^8.2.4",
     "prettier": "^3.3.3",
+    "rimraf": "4.4.1",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.6.3"
   }
-}
+}
diff --git a/packages/schema-sdk/__tests__/__snapshots__/openapi.extended.generate.test.ts.snap b/packages/schema-sdk/__tests__/__snapshots__/openapi.extended.generate.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`full-name-strategy 1`] = `
 "import { APIClient, APIClientRequestOpts, APIClientOptions } from "@interweb/fetch-api-client";
diff --git a/packages/schema-sdk/__tests__/__snapshots__/openapi.generate.test.ts.snap b/packages/schema-sdk/__tests__/__snapshots__/openapi.generate.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`merged 1`] = `
 "import { APIClient, APIClientRequestOpts, APIClientOptions } from "@interweb/fetch-api-client";
diff --git a/packages/schema-sdk/__tests__/__snapshots__/openapi.overrides.test.ts.snap b/packages/schema-sdk/__tests__/__snapshots__/openapi.overrides.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`useLastSegment false 1`] = `
 "/* io.k8s.api.admissionregistration.v1.MutatingWebhook */
diff --git a/packages/schema-sdk/__tests__/__snapshots__/openapi.test.ts.snap b/packages/schema-sdk/__tests__/__snapshots__/openapi.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`naming 1`] = `
 "/* io.k8s.api.admissionregistration.v1.MutatingWebhook */
diff --git a/packages/schema-sdk/__tests__/template.literal.test.ts b/packages/schema-sdk/__tests__/template.literal.test.ts
@@ -5,6 +5,7 @@ import { createPathTemplateLiteral, getDefaultSchemaSDKOptions } from '../src';
 const options = getDefaultSchemaSDKOptions();
 export const renderTemplateTag = (str: string) => {
   return generate(
+    // @ts-ignore
     createPathTemplateLiteral(
       {
         ...options,
diff --git a/packages/schema-sdk/package.json b/packages/schema-sdk/package.json
@@ -29,9 +29,11 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@babel/generator": "^7.24.4",
-    "@babel/types": "^7.24.0",
-    "@interweb-utils/casing": "^0.2.0",
+    "@babel/generator": "7.28.5",
+    "@babel/parser": "^7.23.6",
+    "@babel/traverse": "7.28.5",
+    "@babel/types": "7.28.5",
+    "@interweb-utils/casing": "^0.3.0",
     "@interweb/fetch-api-client": "^0.6.1",
     "deepmerge": "^4.3.1",
     "fast-json-patch": "^3.1.1",
@@ -45,6 +47,7 @@
     "openapi"
   ],
   "devDependencies": {
+    "@types/babel__generator": "^7.27.0",
     "jest-diff": "^30.0.4"
   }
 }
diff --git a/packages/schema-sdk/src/openapi.ts b/packages/schema-sdk/src/openapi.ts
@@ -1059,6 +1059,7 @@ export function generateOpenApiClient(
   const gvkOpsStmts = options.opsIndex?.enabled ? generateGVKOpsStatements(options, patchedSchema) : [];
 
   let code = generate(
+    // @ts-ignore
     t.file(
       t.program([
         t.importDeclaration(
@@ -1078,9 +1079,13 @@ export function generateOpenApiClient(
           ],
           t.stringLiteral(options.npmApiClient)
         ),
+        // @ts-ignore
         ...types,
+        // @ts-ignore
         ...openApiTypes,
+        // @ts-ignore
         clientClass,
+        // @ts-ignore
         ...gvkOpsStmts,
       ])
     )
@@ -1412,7 +1417,7 @@ export function generateReactQueryHooks(
   const funcDecls = components.map((comp) => comp.funcDecl);
   // Build AST and generate code
   const ast = t.file(t.program([...uniqueImportDecls, ...uniqueConstDecls, ...funcDecls]));
-  const code = generate(ast).code;
+  const code = generate(ast as any).code;
   return code;
 }
 
diff --git a/packages/schema-typescript/__tests__/__snapshots__/additional-props.test.ts.snap b/packages/schema-typescript/__tests__/__snapshots__/additional-props.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`additional 1`] = `
 "export interface Person {
diff --git a/packages/schema-typescript/__tests__/__snapshots__/arrays.test.ts.snap b/packages/schema-typescript/__tests__/__snapshots__/arrays.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`works 1`] = `
 "export interface Dog {
diff --git a/packages/schema-typescript/__tests__/__snapshots__/assetlist.test.ts.snap b/packages/schema-typescript/__tests__/__snapshots__/assetlist.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`assetlist 1`] = `
 "export interface Asset {
diff --git a/packages/schema-typescript/__tests__/__snapshots__/chain.test.ts.snap b/packages/schema-typescript/__tests__/__snapshots__/chain.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`chain 1`] = `
 "export interface Peer {
diff --git a/packages/schema-typescript/__tests__/__snapshots__/const.test.ts.snap b/packages/schema-typescript/__tests__/__snapshots__/const.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`const 1`] = `
 "export interface Person {
diff --git a/packages/schema-typescript/__tests__/__snapshots__/contract.test.ts.snap b/packages/schema-typescript/__tests__/__snapshots__/contract.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`contract 1`] = `
 "export type Addr = string;
diff --git a/packages/schema-typescript/__tests__/__snapshots__/items.test.ts.snap b/packages/schema-typescript/__tests__/__snapshots__/items.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`works 1`] = `
 "export interface Dog {
diff --git a/packages/schema-typescript/__tests__/__snapshots__/memo.test.ts.snap b/packages/schema-typescript/__tests__/__snapshots__/memo.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`memo 1`] = `
 "export interface Memo {
diff --git a/packages/schema-typescript/__tests__/__snapshots__/nested.test.ts.snap b/packages/schema-typescript/__tests__/__snapshots__/nested.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`works 1`] = `
 "export interface Person {
diff --git a/packages/schema-typescript/__tests__/__snapshots__/readme.test.ts.snap b/packages/schema-typescript/__tests__/__snapshots__/readme.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`works 1`] = `
 "export interface Pet {
diff --git a/packages/schema-typescript/__tests__/__snapshots__/simple.test.ts.snap b/packages/schema-typescript/__tests__/__snapshots__/simple.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`works 1`] = `
 "export interface Person {
diff --git a/packages/schema-typescript/__tests__/__snapshots__/types.test.ts.snap b/packages/schema-typescript/__tests__/__snapshots__/types.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`works 1`] = `
 "export interface Dog {
diff --git a/packages/schema-typescript/package.json b/packages/schema-typescript/package.json
@@ -29,12 +29,15 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@babel/generator": "^7.24.4",
-    "@babel/types": "^7.24.0",
-    "@interweb-utils/casing": "^0.2.0",
+    "@babel/generator": "^7.28.5",
+    "@babel/types": "^7.28.5",
+    "@interweb-utils/casing": "^0.3.0",
     "deepmerge": "^4.3.1",
     "minimatch": "^9.0.4"
   },
+  "devDependencies": {
+    "@types/babel__generator": "^7.27.0"
+  },
   "keywords": [
     "jsonschema",
     "schema",
diff --git a/packages/strfy-js/__tests__/expand-paths.test.ts b/packages/strfy-js/__tests__/expand-paths.test.ts
@@ -1,6 +1,6 @@
 const minimatch = require("minimatch").minimatch;
 
-function dirname(path) {
+function dirname(path: string): string {
   return path.substring(0, path.lastIndexOf('/')) || '/';
 }
 
@@ -28,12 +28,12 @@ export function expandPaths(paths: string[]): string[] {
   return sortPaths(Array.from(pathSet));
 }
 
-function sortPaths(paths) {
+function sortPaths(paths: string[]): string[] {
   // First sort alphabetically
-  paths.sort((a, b) => a.localeCompare(b));
+  paths.sort((a: string, b: string) => a.localeCompare(b));
 
   // Then sort by depth (number of '/' in the path)
-  paths.sort((a, b) => {
+  paths.sort((a: string, b: string) => {
     const depthA = (a.match(/\//g) || []).length;
     const depthB = (b.match(/\//g) || []).length;
     return depthB - depthA;  // Sort from deepest to shallowest
@@ -42,14 +42,14 @@ function sortPaths(paths) {
   return paths;
 }
 
-function hasAncestor(currentPath, includePaths) {
+function hasAncestor(currentPath: string, includePaths: string[]): boolean {
   return !!findNearestAncestor(currentPath, includePaths);
 }
 
-function findNearestAncestor(currentPath, includePaths) {
+function findNearestAncestor(currentPath: string, includePaths: string[]): string | null {
   let pathToCheck = currentPath;
   while (pathToCheck !== '/' && pathToCheck !== '') {
-    if (includePaths.some(includePath => minimatch(pathToCheck + '/', includePath))) {
+    if (includePaths.some((includePath: string) => minimatch(pathToCheck + '/', includePath))) {
       if (pathToCheck !== currentPath)
         return pathToCheck; // Return the matching parent directory
     }
diff --git a/packages/strfy-js/src/js.ts b/packages/strfy-js/src/js.ts
@@ -156,10 +156,11 @@ export function jsStringify(obj: any, options?: JSStringifyOptions): string {
       });
 
       // Apply custom default values setter if available
-      Object.keys(defaultValuesSetter).forEach(pattern => {
-        if (matchesPattern(currentPath, dirname(pattern))) {
-          const setter: JSStringifySetter = defaultValuesSetter[pattern];
-          const property = pattern.split('/').pop(); // get the last segment as property name
+      if (typeof defaultValuesSetter === 'object') {
+        Object.keys(defaultValuesSetter).forEach(pattern => {
+          if (matchesPattern(currentPath, dirname(pattern))) {
+            const setter: JSStringifySetter = (defaultValuesSetter as { [path: string]: JSStringifySetter })[pattern];
+            const property = pattern.split('/').pop(); // get the last segment as property name
           if (property === '*') {
             // Apply setter to all properties if needed
             Object.keys(obj).forEach(prop => {
@@ -208,12 +209,13 @@ export function jsStringify(obj: any, options?: JSStringifyOptions): string {
             obj[property] = defaultValuesMap[pattern];
           }
         }
-      });
+        });
+      }
 
 
       // INCLUDES EXCLUDES
 
-      obj = Object.keys(obj).reduce((m, key) => {
+      obj = Object.keys(obj).reduce((m: Record<string, any>, key) => {
         const fullPath = `${currentPath}/${key}`;
         if (shouldInclude(fullPath, {
           exclude,
diff --git a/packages/strfy-js/src/utils.ts b/packages/strfy-js/src/utils.ts
@@ -79,12 +79,12 @@ export function expandPaths(paths: string[]): string[] {
   return sortPaths(Array.from(pathSet));
 }
 
-function sortPaths(paths) {
+function sortPaths(paths: string[]): string[] {
   // First sort alphabetically
-  paths.sort((a, b) => a.localeCompare(b));
+  paths.sort((a: string, b: string) => a.localeCompare(b));
 
   // Then sort by depth (number of '/' in the path)
-  paths.sort((a, b) => {
+  paths.sort((a: string, b: string) => {
     const depthA = (a.match(/\//g) || []).length;
     const depthB = (b.match(/\//g) || []).length;
     return depthB - depthA;  // Sort from deepest to shallowest
@@ -93,10 +93,10 @@ function sortPaths(paths) {
   return paths;
 }
 
-function findNearestAncestor(currentPath, includePaths) {
+function findNearestAncestor(currentPath: string, includePaths: string[]): string | null {
   let pathToCheck = currentPath;
   while (pathToCheck !== '/' && pathToCheck !== '') {
-    if (includePaths.some(includePath => minimatch(pathToCheck + '/', includePath))) {
+    if (includePaths.some((includePath: string) => minimatch(pathToCheck + '/', includePath))) {
       if (pathToCheck !== currentPath)
         return pathToCheck; // Return the matching parent directory
     }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Jest Snapshot v1, https://goo.gl/fbAQLP`
	`1`	`+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing`
`2`	`2`
`3`	`3`	exports[`full-name-strategy 1`] = `
`4`	`4`	`"import { APIClient, APIClientRequestOpts, APIClientOptions } from "@interweb/fetch-api-client";`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import { createPathTemplateLiteral, getDefaultSchemaSDKOptions } from '../src';`
`5`	`5`	`const options = getDefaultSchemaSDKOptions();`
`6`	`6`	`export const renderTemplateTag = (str: string) => {`
`7`	`7`	`return generate(`
	`8`	`+ // @ts-ignore`
`8`	`9`	`createPathTemplateLiteral(`
`9`	`10`	`{`
`10`	`11`	`...options,`