shapedef 1.0.3 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shapedef",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "",
   "main": "./dist/cjs/index.js",
   "types": "./dist/cjs/index.d.ts",

package/src/shape-utils.ts

@@ -1,5 +1,5 @@
 import { TupleOf } from "./common";
-import { Shape } from "./shape";
+import { Shape, ShapeRef } from "./shape";
 
 export const shapeCompare = (a: Shape, b: Shape): boolean =>
   JSON.stringify(a) === JSON.stringify(b);
@@ -44,3 +44,46 @@ export const simplifyShape = (shape: Shape): Shape => {
       return shape;
   }
 };
+
+export const getShapeDeps = (shape: Shape): ShapeRef[] => {
+  const deps: Map<string, ShapeRef> = new Map();
+
+  switch (shape.type) {
+    case "ref":
+      {
+        deps.set(shape.name, shape);
+        if (shape.hint) {
+          getShapeDeps(shape.hint).forEach((x) => deps.set(x.name, x));
+        }
+      }
+      break;
+    case "mapping":
+      {
+        for (const inner of Object.values(shape.rec)) {
+          getShapeDeps(inner).forEach((x) => deps.set(x.name, x));
+        }
+      }
+      break;
+    case "array":
+      {
+        getShapeDeps(shape.item).forEach((x) => deps.set(x.name, x));
+      }
+      break;
+    case "union":
+      {
+        for (const inner of shape.ofs) {
+          getShapeDeps(inner).forEach((x) => deps.set(x.name, x));
+        }
+      }
+      break;
+    case "tuple":
+      {
+        for (const inner of shape.tup) {
+          getShapeDeps(inner).forEach((x) => deps.set(x.name, x));
+        }
+      }
+      break;
+  }
+
+  return Array.from(deps.values());
+};

package/src/translations/typescript.ts

@@ -1,6 +1,7 @@
 import { mkpad } from "../common/padding";
 import { Shape, shapes } from "../shape";
 import { ShapeCollection } from "../shape-collection";
+import { getShapeDeps } from "../shape-utils";
 import { TranslationFunc } from "./translation";
 
 type Context = {
@@ -150,7 +151,11 @@ export const typescriptCollection = (
 ) => {
   const { summaryName = "Schema" } = options;
 
-  const items = Array.from(collection.values());
+  const items = Array.from(collection.values()).toSorted((a, b) => {
+    const depsA = getShapeDeps(a);
+    const depsB = getShapeDeps(b);
+    return depsA.length - depsB.length;
+  });
 
   const rec = shapes.mapping(
     Object.fromEntries(