@effect-app/eslint-codegen-model 1.42.0 → 1.42.2

package/eslint.config.mjs

@@ -1,6 +1,6 @@
 import path from "node:path"
 import { fileURLToPath } from "node:url"
-import { augmentedConfig } from "../../eslint.base.config.mjs"
+import { augmentedConfig } from "effect-app/eslint.base.config"
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)

package/package.json

@@ -2,11 +2,11 @@
   "name": "@effect-app/eslint-codegen-model",
   "description": "Contains eslint helpers",
   "sideEffects": false,
-  "version": "1.42.0",
+  "version": "1.42.2",
   "dependencies": {
-    "@babel/generator": "7.28.0",
-    "@babel/parser": "7.28.0",
-    "@typescript-eslint/utils": "8.39.0",
+    "@babel/generator": "7.28.3",
+    "@babel/parser": "7.28.4",
+    "@typescript-eslint/utils": "8.42.0",
     "eslint-plugin-codegen": "0.17.0",
     "glob": "8.1.0",
     "io-ts": "2.2.22",
@@ -15,23 +15,24 @@
     "lodash": "4.17.21"
   },
   "peerDependencies": {
-    "effect": "^3.17.6"
+    "effect": "^3.17.13"
   },
   "devDependencies": {
     "@types/babel__generator": "7.27.0",
     "@types/babel__traverse": "7.28.0",
     "@types/glob": "8.1.0",
     "@types/lodash": "4.17.20",
-    "effect": "^3.17.6",
+    "effect": "^3.17.13",
     "madge": "8.0.0",
-    "typescript": "^5.8.3"
+    "typescript": "~5.9.2",
+    "effect-app": "3.3.4"
   },
   "main": "index.js",
   "author": "Wessel van der Veen & Scott vanBommel",
   "license": "ISC",
   "scripts": {
     "watch": "pnpm build:tsc -w",
-    "build:tsc": "pnpm clean-dist && tspc --build",
+    "build:tsc": "pnpm clean-dist && tsc --build",
     "build": "tspc",
     "circular": "madge --circular --ts-config ./tsconfig.json --extensions ts ./src",
     "ncu": "ncu",

package/dist/compiler.d.ts

@@ -1,3 +0,0 @@
-import ts from "typescript";
-export declare function processNode(tc: ts.TypeChecker, root: ts.Node, writeFullTypes?: boolean): (n: ts.Node) => string[] | undefined;
-//# sourceMappingURL=compiler.d.ts.map

package/dist/compiler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../src/compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,MAAM,YAAY,CAAA;AA6B3C,wBAAgB,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,cAAc,UAAQ,OAExE,GAAG,IAAI,0BAsNnB"}

package/dist/compiler.js

@@ -1,256 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.processNode = void 0;
-const typescript_1 = __importStar(require("typescript"));
-const sortUnion = (a, b) => {
-    if (a !== "null" && a !== "undefined" && (b === "null" || b === "undefined")) {
-        return -1;
-    }
-    if (b !== "null" && b !== "undefined" && (a === "null" || a === "undefined")) {
-        return 1;
-    }
-    if (a < b) {
-        return -1;
-    }
-    if (a > b) {
-        return 1;
-    }
-    return 0;
-};
-const sortAlpha = (a, b) => {
-    if (a < b) {
-        return -1;
-    }
-    if (a > b) {
-        return 1;
-    }
-    return 0;
-};
-// TODO: we don't support string literals with spaces in them currently.
-const rx = /(([^\s\<\>\,\[\(]+)? \| ([^\s\<\>\,\]\)]+))+/;
-function sortIt(str) {
-    return str.split(" | ").sort(sortUnion).join(" | ");
-}
-const debug = false; // true
-function processNode(tc, root, writeFullTypes = false) {
-    const processed = [];
-    return (n) => {
-        var _a, _b;
-        if ( /*ts.isClassDeclaration(n) || ts.isTypeAliasDeclaration(n)*/true) {
-            let modelName = null;
-            if (typescript_1.default.isClassDeclaration(n)) {
-                if (n.getText().match(/(Extended(Tagged)?Class)|ExtendedTaggedRequest/)) {
-                    modelName = (_a = n.name) === null || _a === void 0 ? void 0 : _a.escapedText;
-                }
-            }
-            if (!modelName) {
-                const constructorName = (_b = n.name) === null || _b === void 0 ? void 0 : _b.escapedText;
-                // TODO: Remove requirement
-                if (!(constructorName === null || constructorName === void 0 ? void 0 : constructorName.endsWith("Constructor"))) {
-                    //console.log("$$$constructorName doesnt end with Constructor", constructorName)
-                    return;
-                }
-                modelName = constructorName.replace("Constructor", "");
-            }
-            if (processed.includes(modelName)) {
-                return;
-            }
-            processed.push(modelName);
-            if (!writeFullTypes) {
-                return [
-                    `export namespace ${modelName} {`,
-                    `  export class From extends S.FromClass<typeof ${modelName}>() {}`,
-                    // `  export const From: FromOps = { $: {} }`,
-                    // `  export interface FromAspects {}`,
-                    "}",
-                ];
-            }
-            //console.log("$$$ constructorName", constructorName)
-            const t = tc.getTypeAtLocation(n);
-            const result = { encoded: [], parsed: [] };
-            const unions = {};
-            //console.log("$$$ fields", t.getProperties().map(x => x.escapedName))
-            t.getProperties().forEach((c) => {
-                const method = c.name;
-                if (method === "encoded" || method === "parsed") {
-                    //console.log("$$$ method", method)
-                    //console.log(c.members)
-                    const tt = tc.getTypeOfSymbolAtLocation(c, n);
-                    // const s = tc.getReturnTypeOfSignature(tt.getCallSignatures()[0])
-                    // const type = tc.getReturnTypeOfSignature(s! as any /* TODO */)
-                    tt.getProperties().forEach(p => {
-                        var _a;
-                        const isLookup = debug && p.escapedName === "carrier";
-                        //kind = 207, 
-                        //arguments[0].escapedText === "HosterRole"
-                        //console.log("$$$p", p.escapedName)
-                        //if (p.escapedName === "opposite") {
-                        //console.log("$$$ a union!", p.declarations?.map(x => x.forEachChild(c => {
-                        // TODO: have to find nullable, array, set, map, etc.
-                        // TODO: "From"
-                        // but also should find fully custom sets like PurchaseOrderModulesSet - we should be able to just use those directly, incl PurchaseOrderModulesSet.From
-                        // for now just skip them?
-                        (_a = p.declarations) === null || _a === void 0 ? void 0 : _a.map(x => x.forEachChild(c => {
-                            var _a;
-                            if (isLookup) {
-                                console.log("$$$ lookup", c.kind, c);
-                            }
-                            if (c.kind === typescript_1.SyntaxKind.CallExpression) { // 207 -- SyntaxKind.ElementAccessExpression) {
-                                let it = c.arguments[0];
-                                //const isState = p.escapedName === "state"
-                                if (isLookup) {
-                                    console.log("$$$ state it", it);
-                                }
-                                const isNullable = ((_a = it.expression) === null || _a === void 0 ? void 0 : _a.escapedText) === "nullable";
-                                const isIt = it.arguments && it.arguments[0]; //it.expression?.escapedText === "nullable"
-                                if (isIt) {
-                                    //console.log("$$ nullable", it.arguments[0])
-                                    // TODO: usually the union is on the last input, we need to support all elements individually however
-                                    it = it.arguments[it.arguments.length - 1];
-                                }
-                                //console.log("$args", it)
-                                //tc.getTypeAtLocation(it)
-                                const tt = tc.getTypeAtLocation(c); //tc.getTypeOfSymbolAtLocation(it.parent, n)
-                                const typeDecl = tc.typeToString(tt, root, typescript_1.default.TypeFormatFlags.NoTruncation
-                                    //ts.TypeFormatFlags.None
-                                    //ts.TypeFormatFlags.AddUndefined |
-                                    // | ts.TypeFormatFlags.NoTypeReduction
-                                    //    | ts.TypeFormatFlags.MultilineObjectLiterals
-                                    //| ts.TypeFormatFlags.InTypeAlias
-                                    | typescript_1.default.TypeFormatFlags.UseAliasDefinedOutsideCurrentScope // prevents import(*)
-                                //  | ts.TypeFormatFlags.UseStructuralFallback
-                                );
-                                if (isLookup) {
-                                    console.log("$$ type", typeDecl);
-                                }
-                                const matches = typeDecl.match(rx);
-                                if (isLookup) {
-                                    console.log("$$ matches", matches);
-                                }
-                                const isOptional = typeDecl.match(/\>, "optional"/);
-                                if (matches) {
-                                    let replaced = matches[0].replace(rx, (match) => sortIt(match));
-                                    replaced = sortIt(isOptional ? isNullable ? replaced.replace(" | null", " | undefined | null") : replaced + " | undefined" : replaced);
-                                    //console.log("$$ replaced", replaced, it.escapedText, matches)
-                                    // if (it.escapedText === "TaskState") {
-                                    //   console.log("Help", it)
-                                    // }
-                                    if (isLookup) {
-                                        console.log("$$$ replaced", it.escapedText, replaced);
-                                    }
-                                    if (it.escapedText && !it.escapedText.endsWith("Set") /* skip the "Set" problem */ && replaced.replace(" | null", "").includes("|")) {
-                                        const replacement = it.escapedText + (isNullable ? " | null" : "") + (isOptional ? " | undefined" : "");
-                                        // if (it.escapedText === "TaskState") {
-                                        //   console.log("$$$", { replaced, replacement })
-                                        //   unions[replaced] = replacement  
-                                        // } else {
-                                        unions[replaced] = replacement;
-                                        if (isLookup) {
-                                            console.log("$$ repl", { replaced, replacement });
-                                        }
-                                        //}
-                                    }
-                                    else {
-                                        //   if (isIt) {
-                                        //     console.log("$$ no name found", it.escapedText)
-                                        // }
-                                        //   console.log("$$ no name found??", it)
-                                    }
-                                }
-                            }
-                            //c.kind === 346 ? console.log(c) : null
-                            //console.log((c as any).flowNode?.node?.name)
-                        }));
-                        //}
-                    });
-                    if (debug && Object.keys(unions).length) {
-                        console.log("$$$ unions to replace", unions);
-                    }
-                    const typeDecl = tc.typeToString(tt, root, typescript_1.default.TypeFormatFlags.NoTruncation
-                        //ts.TypeFormatFlags.None
-                        //ts.TypeFormatFlags.AddUndefined |
-                        // | ts.TypeFormatFlags.NoTypeReduction
-                        //    | ts.TypeFormatFlags.MultilineObjectLiterals
-                        //| ts.TypeFormatFlags.InTypeAlias
-                        | typescript_1.default.TypeFormatFlags.UseAliasDefinedOutsideCurrentScope // prevents import(*)
-                    //  | ts.TypeFormatFlags.UseStructuralFallback
-                    );
-                    const str = typeDecl === "{}" ? [] :
-                        // drop leading { and trailing }
-                        typeDecl.substring(2, typeDecl.length - 2)
-                            .split(";")
-                            .map(l => l.trim())
-                            // todo; skip the first split, as its the property
-                            .map(l => l.replace(rx, (match) => {
-                            var _a;
-                            const rpl = sortIt(match);
-                            //if (debug) { console.log("Searching for", rpl, { unions}) }
-                            if (rpl.endsWith(" | undefined")) {
-                                const sub = unions[rpl.replace(" | undefined", "")];
-                                return sub ? sub + " | undefined" : (_a = unions[rpl]) !== null && _a !== void 0 ? _a : rpl;
-                            }
-                            const sub = unions[rpl];
-                            return (sub ? sub : rpl);
-                        })
-                            .replaceAll(" Array<", " ReadonlyArray<") // .replaceAll(/(Array|Set|Map)\</", "ReadonlyArray<") //
-                            .replaceAll(" Set<", " ReadonlySet<")
-                            .replaceAll(" Map<", " ReadonlyMap<")
-                            .replaceAll("(Array<", "(ReadonlyArray<") // .replaceAll(/(Array|Set|Map)\</", "ReadonlyArray<") //
-                            .replaceAll("(Set<", "(ReadonlySet<")
-                            .replaceAll("(Map<", "(ReadonlyMap<")
-                            .replaceAll(" Array.Array<", " ReadonlyArray<") // .replaceAll(/(Array|Set|Map)\</", "ReadonlyArray<") //
-                            .replaceAll(" Set.Set<", " ReadonlySet<")
-                            .replaceAll(" Map.Map<", " ReadonlyMap<"))
-                            // we sort for now, because otherwise we have sometimes multiple times changing back and forth between editor and console.
-                            .sort(sortAlpha);
-                    // Taken care of by "ts.TypeFormatFlags.UseAliasDefinedOutsideCurrentScope"
-                    //.replaceAll(/import\("[^"]+"\)\./g, "")
-                    result[method] = str;
-                }
-            });
-            if (!("parsed" in result)) {
-                throw new Error("No parsed result");
-            }
-            if (!("encoded" in result)) {
-                throw new Error("No encoded result");
-            }
-            const encoded = result.encoded.filter(x => !!x);
-            const parsed = result.parsed.filter(x => !!x);
-            return [
-                `export interface ${modelName} {${parsed.length ? "\n" + parsed.map(l => "  " + l).join("\n") + "\n" : ""}}`,
-                `export namespace ${modelName} {`,
-                `  export interface From {${encoded.length ? "\n" + encoded.map(l => "    " + l).join("\n") + "\n  " : ""}}`,
-                `  export const From: FromOps = {}`,
-                // `  export const From: FromOps = { $: {} }`,
-                // `  export interface FromAspects {}`,
-                `  export interface FromOps {}`,
-                "}",
-            ];
-        }
-    };
-}
-exports.processNode = processNode;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../src/compiler.ts"],"names":[],"mappings":"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"}