@extentos/mcp-server 0.0.27 → 0.0.28
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/dist/tools/docs/index.d.ts.map +1 -1
- package/dist/tools/docs/index.js +6 -2
- package/dist/tools/docs/index.js.map +1 -1
- package/dist/tools/handlers/generateConsumer.d.ts.map +1 -1
- package/dist/tools/handlers/generateConsumer.js +42 -4
- package/dist/tools/handlers/generateConsumer.js.map +1 -1
- package/dist/tools/handlers/initSpec.d.ts.map +1 -1
- package/dist/tools/handlers/initSpec.js +27 -3
- package/dist/tools/handlers/initSpec.js.map +1 -1
- package/dist/tools/util/userCodeMerge.d.ts +41 -5
- package/dist/tools/util/userCodeMerge.d.ts.map +1 -1
- package/dist/tools/util/userCodeMerge.js +61 -20
- package/dist/tools/util/userCodeMerge.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/docs/index.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAqJD,eAAO,MAAM,SAAS,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/docs/index.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAqJD,eAAO,MAAM,SAAS,EAAE,QAAQ,EAq8B/B,CAAC;AAEF,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,QAAQ,EAAE,CAuB/E"}
|
package/dist/tools/docs/index.js
CHANGED
|
@@ -930,7 +930,11 @@ export const DOC_INDEX = [
|
|
|
930
930
|
"Examples: `ExtentosBootstrap.kt`, `ExtentosBootstrap.swift`.\n" +
|
|
931
931
|
"Apply: write `content` to `path`.\n\n" +
|
|
932
932
|
"─── action: \"write\" ───\n" +
|
|
933
|
-
"Server has already done all merging. Write `content` to `path` verbatim. Used when the agent passed `projectPath` to initSpec / generateConsumer and the server performed the USER-CODE merge on the agent's behalf. The response also carries `mergeReport: { preserved: string[], orphaned: string[], warnings: [...] }` summarizing what happened
|
|
933
|
+
"Server has already done all merging. Write `content` to `path` verbatim. Used when the agent passed `projectPath` to initSpec / generateConsumer and the server performed the USER-CODE merge on the agent's behalf. The response also carries `mergeReport: { preserved: string[], orphaned: string[], extra: string[], warnings: [...] }` summarizing what happened.\n" +
|
|
934
|
+
" - `preserved`: USER-CODE blocks whose existing body was spliced into the new template (the dev's code survived in place).\n" +
|
|
935
|
+
" - `orphaned`: blocks whose corresponding HANDLER / STREAM was removed from the spec — body kept at end-of-file with an `// ORPHANED:<name>` annotation. Surface these to the dev so they can review and either delete or re-add the spec entry.\n" +
|
|
936
|
+
" - `extra`: blocks present in the existing file that the template didn't generate (developer-created shared utility blocks, e.g., a `// USER-CODE-START:helpers` block holding HTTP clients). Preserved silently at end-of-file with no annotation. Listed for transparency; agents typically don't need to surface these.\n" +
|
|
937
|
+
" - `warnings`: soft warnings (corrupt input, duplicate block names). Surface to the dev.\n" +
|
|
934
938
|
"Apply: write `content` to `path`. Done.\n\n" +
|
|
935
939
|
"─── action: \"create_or_merge\" ───\n" +
|
|
936
940
|
"**Legacy / no-projectPath path.** The file contains `USER-CODE-START:<name>` / `USER-CODE-END:<name>` blocks where the developer fills in handler bodies, stream-processing code, imports, etc. On regeneration, those blocks MUST be preserved.\n" +
|
|
@@ -962,7 +966,7 @@ export const DOC_INDEX = [
|
|
|
962
966
|
"- `replace_region` says 'we own one block of an existing file; splice into that block only.'\n" +
|
|
963
967
|
"- `manual_patch` says 'we don't own this file; here are instructions, you decide.'\n" +
|
|
964
968
|
"Conflating them silently destroys developer code (overwriting `create_or_merge` as if it were `create`) or breaks regeneration (treating `replace_region` as a full file write blows away the surrounding code).",
|
|
965
|
-
keywords: ["files", "action", "create", "write", "create_or_merge", "replace_region", "manual_patch", "user-code", "merge", "regeneration", "marker", "projectPath", "mergeReport", "orphaned"],
|
|
969
|
+
keywords: ["files", "action", "create", "write", "create_or_merge", "replace_region", "manual_patch", "user-code", "merge", "regeneration", "marker", "projectPath", "mergeReport", "orphaned", "extra", "helpers"],
|
|
966
970
|
relatedTools: ["generateConnectionModule", "initSpec", "generateConsumer"],
|
|
967
971
|
},
|
|
968
972
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/docs/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/docs/index.ts"],"names":[],"mappings":"AAAA,8CAA8C;AAC9C,yEAAyE;AACzE,sEAAsE;AACtE,0EAA0E;AAC1E,qEAAqE;AACrE,uBAAuB;AAUvB,2EAA2E;AAC3E,mEAAmE;AACnE,uDAAuD;AACvD,MAAM,0BAA0B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6JA8I0H,CAAC;AAE9J,MAAM,CAAC,MAAM,SAAS,GAAe;IACnC;QACE,KAAK,EAAE,iBAAiB;QACxB,KAAK,EAAE,+BAA+B;QACtC,OAAO,EACL,uPAAuP;YACvP,8KAA8K;YAC9K,oQAAoQ;YACpQ,kGAAkG;YAClG,oDAAoD;YACpD,yUAAyU;YACzU,kNAAkN;YAClN,4EAA4E;YAC5E,sIAAsI;YACtI,oFAAoF;YACpF,yFAAyF;YACzF,6pBAA6pB;YAC7pB,kIAAkI;YAClI,82BAA82B;YAC92B,4NAA4N;QAC9N,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,CAAC;QACpM,YAAY,EAAE,CAAC,iBAAiB,EAAE,0BAA0B,EAAE,UAAU,EAAE,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,YAAY,EAAE,wBAAwB,CAAC;KACtK;IACD;QACE,KAAK,EAAE,aAAa;QACpB,KAAK,EAAE,aAAa;QACpB,OAAO,EACL,iRAAiR;YACjR,yBAAyB;YACzB,uFAAuF;YACvF,4HAA4H;YAC5H,6NAA6N;YAC7N,sBAAsB;YACtB,qFAAqF;YACrF,mDAAmD;YACnD,gBAAgB;YAChB,iJAAiJ;YACjJ,qHAAqH;YACrH,gBAAgB;YAChB,wFAAwF;YACxF,qJAAqJ;YACrJ,mCAAmC;YACnC,qfAAqf;YACrf,oBAAoB;YACpB,+JAA+J;YAC/J,sGAAsG;YACtG,yKAAyK;YACzK,YAAY;YACZ,8GAA8G;YAC9G,sBAAsB;YACtB,gIAAgI;YAChI,yBAAyB;YACzB,mGAAmG;YACnG,6IAA6I;YAC7I,iIAAiI;YACjI,sBAAsB;YACtB,4LAA4L;YAC5L,yDAAyD;YACzD,gBAAgB;YAChB,yNAAyN;YACzN,gIAAgI;YAChI,2JAA2J;YAC3J,gaAAga;YACha,oBAAoB;YACpB,wGAAwG;YACxG,+HAA+H;YAC/H,YAAY;YACZ,6IAA6I;YAC7I,wBAAwB;YACxB,8HAA8H;YAC9H,qIAAqI;YACrI,0KAA0K;YAC1K,sBAAsB;YACtB,mKAAmK;YACnK,2DAA2D;YAC3D,gBAAgB;YAChB,sKAAsK;YACtK,qMAAqM;YACrM,0ZAA0Z;YAC1Z,+HAA+H;YAC/H,oBAAoB;YACpB,+IAA+I;YAC/I,wJAAwJ;YACxJ,YAAY;YACZ,wJAAwJ;YACxJ,4BAA4B;YAC5B,gVAAgV;QAClV,QAAQ,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;QAClI,YAAY,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,YAAY,CAAC;KAC5D;IACD;QACE,KAAK,EAAE,cAAc;QACrB,KAAK,EAAE,cAAc;QACrB,OAAO,EACL,6ZAA6Z;YAC7Z,8PAA8P;YAC9P,wBAAwB;YACxB,0EAA0E;YAC1E,uIAAuI;YACvI,iMAAiM;YACjM,8BAA8B;YAC9B,0KAA0K;YAC1K,gBAAgB;YAChB,mOAAmO;YACnO,mJAAmJ;YACnJ,2HAA2H;YAC3H,qPAAqP;YACrP,oBAAoB;YACpB,gGAAgG;YAChG,0JAA0J;YAC1J,0JAA0J;YAC1J,YAAY;YACZ,sJAAsJ;YACtJ,wBAAwB;YACxB,iFAAiF;YACjF,yJAAyJ;YACzJ,mOAAmO;YACnO,8BAA8B;YAC9B,iGAAiG;YACjG,gBAAgB;YAChB,oIAAoI;YACpI,+IAA+I;YAC/I,uKAAuK;YACvK,YAAY;YACZ,gHAAgH;YAChH,qCAAqC;YACrC,yGAAyG;YACzG,gHAAgH;YAChH,oLAAoL;YACpL,8BAA8B;YAC9B,sFAAsF;YACtF,4KAA4K;YAC5K,gBAAgB;YAChB,mLAAmL;YACnL,oFAAoF;YACpF,kHAAkH;YAClH,gfAAgf;YAChf,8ZAA8Z;YAC9Z,YAAY;YACZ,2GAA2G;YAC3G,iCAAiC;YACjC,2EAA2E;YAC3E,2GAA2G;YAC3G,iIAAiI;YACjI,mEAAmE;YACnE,gBAAgB;YAChB,6IAA6I;YAC7I,iCAAiC;YACjC,uDAAuD;YACvD,oIAAoI;YACpI,0EAA0E;YAC1E,gBAAgB;YAChB,mKAAmK;YACnK,4BAA4B;YAC5B,kfAAkf;QACpf,QAAQ,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC;QACjL,YAAY,EAAE,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,gBAAgB,CAAC;KACxE;IACD;QACE,KAAK,EAAE,eAAe;QACtB,KAAK,EAAE,eAAe;QACtB,OAAO,EACL,gLAAgL;YAChL,6DAA6D;YAC7D,mFAAmF;YACnF,+EAA+E;YAC/E,qFAAqF;YACrF,qIAAqI;YACrI,yBAAyB;YACzB,kJAAkJ;YAClJ,0LAA0L;YAC1L,uMAAuM;YACvM,mCAAmC;YACnC,0GAA0G;YAC1G,gBAAgB;YAChB,+vBAA+vB;YAC/vB,0RAA0R;YAC1R,qKAAqK;YACrK,4NAA4N;YAC5N,4fAA4f;YAC5f,oBAAoB;YACpB,6EAA6E;YAC7E,iHAAiH;YACjH,uGAAuG;YACvG,YAAY;YACZ,OAAO;YACP,gCAAgC;YAChC,4BAA4B;YAC5B,iCAAiC;YACjC,iCAAiC;YACjC,oBAAoB;YACpB,kGAAkG;YAClG,mDAAmD;YACnD,SAAS;YACT,SAAS;YACT,qBAAqB;YACrB,yEAAyE;YACzE,4LAA4L;YAC5L,0LAA0L;YAC1L,kFAAkF;YAClF,+EAA+E;YAC/E,wBAAwB;YACxB,oFAAoF;YACpF,+PAA+P;YAC/P,2EAA2E;YAC3E,uLAAuL;YACvL,YAAY;YACZ,uDAAuD;YACvD,wDAAwD;YACxD,IAAI;YACJ,kEAAkE;YAClE,uCAAuC;YACvC,kCAAkC;YAClC,0CAA0C;YAC1C,0BAA0B;YAC1B,kDAAkD;YAClD,oDAAoD;YACpD,YAAY;YACZ,SAAS;YACT,QAAQ;YACR,gBAAgB;YAChB,mDAAmD;YACnD,IAAI;YACJ,yBAAyB;YACzB,6CAA6C;YAC7C,wCAAwC;YACxC,yCAAyC;YACzC,4BAA4B;YAC5B,0CAA0C;YAC1C,4CAA4C;YAC5C,YAAY;YACZ,SAAS;YACT,ghBAAghB;YAChhB,oBAAoB;YACpB,0PAA0P;YAC1P,0IAA0I;YAC1I,iOAAiO;YACjO,YAAY;YACZ,sQAAsQ;YACtQ,oBAAoB;YACpB,iGAAiG;YACjG,4GAA4G;YAC5G,mEAAmE;YACnE,YAAY;YACZ,gIAAgI;YAChI,yBAAyB;YACzB,iJAAiJ;YACjJ,8KAA8K;YAC9K,8JAA8J;YAC9J,iPAAiP;YACjP,oBAAoB;YACpB,kXAAkX;YAClX,YAAY;YACZ,0IAA0I;YAC1I,0BAA0B;YAC1B,iEAAiE;YACjE,0GAA0G;YAC1G,qDAAqD;YACrD,yBAAyB;YACzB,+DAA+D;YAC/D,qGAAqG;YACrG,2BAA2B;YAC3B,uGAAuG;YACvG,+QAA+Q;YAC/Q,wCAAwC;YACxC,oCAAoC;YACpC,+HAA+H;YAC/H,4JAA4J;YAC5J,iEAAiE;YACjE,+BAA+B;YAC/B,2EAA2E;YAC3E,gEAAgE;YAChE,wCAAwC;YACxC,4FAA4F;YAC5F,sCAAsC;YACtC,iMAAiM;YACjM,kCAAkC;YAClC,kDAAkD;YAClD,sCAAsC;YACtC,0EAA0E;YAC1E,4BAA4B;YAC5B,0IAA0I;YAC1I,4BAA4B;YAC5B,uFAAuF;YACvF,iDAAiD;YACjD,4FAA4F;YAC5F,iCAAiC;YACjC,kGAAkG;YAClG,6DAA6D;YAC7D,iBAAiB;YACjB,gYAAgY;QAClY,QAAQ,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,cAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,CAAC;QAClK,YAAY,EAAE,CAAC,iBAAiB,EAAE,yBAAyB,EAAE,YAAY,CAAC;KAC3E;IACD;QACE,KAAK,EAAE,cAAc;QACrB,KAAK,EAAE,cAAc;QACrB,OAAO,EACL,gQAAgQ;YAChQ,oFAAoF;YACpF,gDAAgD;YAChD,qCAAqC;YACrC,yGAAyG;YACzG,wBAAwB;YACxB,wBAAwB;YACxB,yKAAyK;YACzK,mUAAmU;YACnU,kJAAkJ;YAClJ,uFAAuF;YACvF,oMAAoM;YACpM,gBAAgB;YAChB,+LAA+L;YAC/L,mLAAmL;YACnL,oKAAoK;YACpK,+EAA+E;YAC/E,oBAAoB;YACpB,wMAAwM;YACxM,kOAAkO;YAClO,mOAAmO;YACnO,YAAY;YACZ,8FAA8F;YAC9F,iDAAiD;YACjD,gIAAgI;YAChI,sBAAsB;YACtB,2EAA2E;YAC3E,sEAAsE;YACtE,wEAAwE;YACxE,YAAY;YACZ,+EAA+E;YAC/E,sBAAsB;YACtB,6GAA6G;YAC7G,wEAAwE;YACxE,gBAAgB;YAChB,qGAAqG;YACrG,4HAA4H;YAC5H,YAAY;YACZ,+CAA+C;YAC/C,gEAAgE;YAChE,uBAAuB;YACvB,0GAA0G;YAC1G,wFAAwF;YACxF,6CAA6C;YAC7C,sBAAsB;YACtB,+IAA+I;YAC/I,gCAAgC;YAChC,oBAAoB;YACpB,2HAA2H;YAC3H,wHAAwH;YACxH,YAAY;YACZ,+EAA+E;YAC/E,wBAAwB;YACxB,4HAA4H;YAC5H,yDAAyD;YACzD,2JAA2J;YAC3J,kBAAkB;YAClB,wGAAwG;YACxG,qCAAqC;YACrC,sBAAsB;YACtB,yFAAyF;YACzF,6FAA6F;YAC7F,gBAAgB;YAChB,+LAA+L;YAC/L,sKAAsK;YACtK,oBAAoB;YACpB,yKAAyK;YACzK,sJAAsJ;YACtJ,YAAY;YACZ,OAAO;YACP,yBAAyB;YACzB,kFAAkF;YAClF,iEAAiE;YACjE,4EAA4E;YAC5E,SAAS;YACT,0BAA0B;YAC1B,qHAAqH;YACrH,+CAA+C;YAC/C,+BAA+B;YAC/B,qKAAqK;YACrK,8BAA8B;YAC9B,qFAAqF;YACrF,0BAA0B;YAC1B,2EAA2E;YAC3E,gBAAgB;YAChB,oIAAoI;YACpI,qGAAqG;YACrG,6BAA6B;YAC7B,uFAAuF;YACvF,qDAAqD;YACrD,iBAAiB;YACjB,yCAAyC;YACzC,mFAAmF;YACnF,6DAA6D;YAC7D,6KAA6K;YAC7K,8TAA8T;YAC9T,gBAAgB;YAChB,sIAAsI;YACtI,+PAA+P;YAC/P,wRAAwR;YACxR,iBAAiB;YACjB,uGAAuG;YACvG,oBAAoB;YACpB,qUAAqU;YACrU,qCAAqC;YACrC,iFAAiF;YACjF,eAAe;YACf,sFAAsF;YACtF,mGAAmG;YACnG,wHAAwH;YACxH,6BAA6B;YAC7B,6DAA6D;YAC7D,iGAAiG;YACjG,yBAAyB;YACzB,sFAAsF;YACtF,yEAAyE;YACzE,yEAAyE;YACzE,SAAS;YACT,oDAAoD;YACpD,8EAA8E;YAC9E,+HAA+H;YAC/H,8DAA8D;QAChE,QAAQ,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC;QACpL,YAAY,EAAE,CAAC,YAAY,EAAE,kBAAkB,CAAC;KACjD;IACD;QACE,KAAK,EAAE,gBAAgB;QACvB,KAAK,EAAE,kBAAkB;QACzB,OAAO,EACL,kZAAkZ;YAClZ,kkBAAkkB;YAClkB,0JAA0J;QAC5J,QAAQ,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,aAAa,CAAC;QACnK,YAAY,EAAE,CAAC,yBAAyB,EAAE,YAAY,CAAC;KACxD;IACD;QACE,KAAK,EAAE,aAAa;QACpB,KAAK,EAAE,aAAa;QACpB,OAAO,EACL,+VAA+V;YAC/V,oGAAoG;YACpG,OAAO;YACP,0CAA0C;YAC1C,kCAAkC;YAClC,8CAA8C;YAC9C,qBAAqB;YACrB,sBAAsB;YACtB,qBAAqB;YACrB,WAAW;YACX,oCAAoC;YACpC,gCAAgC;YAChC,qCAAqC;YACrC,qCAAqC;YACrC,wBAAwB;YACxB,sGAAsG;YACtG,uDAAuD;YACvD,aAAa;YACb,WAAW;YACX,SAAS;YACT,SAAS;YACT,4TAA4T;QAC9T,QAAQ,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC;QAC9F,YAAY,EAAE,CAAC,cAAc,EAAE,UAAU,EAAE,YAAY,EAAE,oBAAoB,CAAC;KAC/E;IACD;QACE,KAAK,EAAE,iBAAiB;QACxB,KAAK,EAAE,0CAA0C;QACjD,OAAO,EACL,6OAA6O;YAC7O,8CAA8C;YAC9C,kDAAkD;YAClD,sDAAsD;YACtD,4EAA4E;YAC5E,0BAA0B;YAC1B,uGAAuG;YACvG,6CAA6C;YAC7C,iFAAiF;YACjF,4FAA4F;YAC5F,6GAA6G;YAC7G,YAAY;YACZ,0LAA0L;YAC1L,4IAA4I;YAC5I,uFAAuF;YACvF,sDAAsD;YACtD,8BAA8B;YAC9B,kDAAkD;YAClD,sFAAsF;YACtF,YAAY;YACZ,iDAAiD;YACjD,sDAAsD;YACtD,yIAAyI;YACzI,2EAA2E;YAC3E,4BAA4B;YAC5B,8BAA8B;YAC9B,yFAAyF;YACzF,qBAAqB;YACrB,uDAAuD;YACvD,kGAAkG;YAClG,2EAA2E;YAC3E,mCAAmC;YACnC,4BAA4B;YAC5B,yGAAyG;YACzG,sBAAsB;YACtB,kHAAkH;YAClH,wBAAwB;YACxB,gCAAgC;YAChC,wCAAwC;YACxC,8DAA8D;YAC9D,YAAY;YACZ,yEAAyE;YACzE,wBAAwB;YACxB,2DAA2D;YAC3D,+CAA+C;YAC/C,8DAA8D;YAC9D,2DAA2D;YAC3D,qHAAqH;YACrH,sBAAsB;YACtB,iHAAiH;YACjH,yCAAyC;YACzC,mGAAmG;YACnG,YAAY;YACZ,sEAAsE;YACtE,yBAAyB;YACzB,2PAA2P;YAC3P,iGAAiG;YACjG,wMAAwM;YACxM,yBAAyB;YACzB,mJAAmJ;YACnJ,uJAAuJ;YACvJ,sGAAsG;YACtG,kIAAkI;QACpI,QAAQ,EAAE;YACR,YAAY;YACZ,OAAO;YACP,YAAY;YACZ,WAAW;YACX,WAAW;YACX,UAAU;YACV,eAAe;YACf,eAAe;YACf,cAAc;YACd,WAAW;YACX,aAAa;YACb,YAAY;YACZ,QAAQ;YACR,WAAW;SACZ;QACD,YAAY,EAAE,CAAC,YAAY,EAAE,oBAAoB,EAAE,cAAc,CAAC;KACnE;IACD;QACE,KAAK,EAAE,uBAAuB;QAC9B,KAAK,EAAE,uBAAuB;QAC9B,OAAO,EACL,qXAAqX;QACvX,QAAQ,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,UAAU,CAAC;QACzF,YAAY,EAAE,CAAC,cAAc,EAAE,qBAAqB,CAAC;KACtD;IACD;QACE,KAAK,EAAE,iBAAiB;QACxB,KAAK,EAAE,0BAA0B;QACjC,OAAO,EACL,kWAAkW;QACpW,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,SAAS,EAAE,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC;QAC7F,YAAY,EAAE,CAAC,cAAc,EAAE,YAAY,CAAC;KAC7C;IACD;QACE,KAAK,EAAE,SAAS;QAChB,KAAK,EAAE,iBAAiB;QACxB,OAAO,EACL,kVAAkV;YAClV,2CAA2C;YAC3C,2JAA2J;YAC3J,4LAA4L;YAC5L,uJAAuJ;YACvJ,q0MAAq0M;QACv0M,QAAQ,EAAE;YACR,QAAQ;YACR,cAAc;YACd,YAAY;YACZ,gBAAgB;YAChB,uBAAuB;YACvB,0BAA0B;YAC1B,uBAAuB;YACvB,mBAAmB;YACnB,qBAAqB;YACrB,gCAAgC;YAChC,OAAO;YACP,SAAS;YACT,OAAO;YACP,QAAQ;YACR,UAAU;SACX;QACD,YAAY,EAAE,CAAC,YAAY,EAAE,UAAU,EAAE,yBAAyB,CAAC;KACpE;IACD;QACE,KAAK,EAAE,wBAAwB;QAC/B,KAAK,EAAE,wBAAwB;QAC/B,OAAO,EACL,wWAAwW;QAC1W,QAAQ,EAAE,CAAC,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,CAAC;QACrG,YAAY,EAAE,CAAC,oBAAoB,EAAE,aAAa,CAAC;KACpD;IACD;QACE,KAAK,EAAE,yBAAyB;QAChC,KAAK,EAAE,2BAA2B;QAClC,OAAO,EACL,0VAA0V;QAC5V,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,CAAC;QAC/F,YAAY,EAAE,CAAC,YAAY,CAAC;KAC7B;IACD;QACE,KAAK,EAAE,aAAa;QACpB,KAAK,EAAE,sBAAsB;QAC7B,OAAO,EACL,+UAA+U;YAC/U,4RAA4R;YAC5R,iDAAiD;YACjD,qGAAqG;YACrG,iJAAiJ;YACjJ,oJAAoJ;YACpJ,wDAAwD;YACxD,yCAAyC;YACzC,sKAAsK;YACtK,8HAA8H;YAC9H,oJAAoJ;YACpJ,kDAAkD;YAClD,wVAAwV;YACxV,sRAAsR;YACtR,sNAAsN;YACtN,uCAAuC;YACvC,sMAAsM;YACtM,kHAAkH;YAClH,ySAAyS;YACzS,qHAAqH;YACrH,2FAA2F;YAC3F,sFAAsF;YACtF,iVAAiV;YACjV,wNAAwN;YACxN,4QAA4Q;YAC5Q,+YAA+Y;YAC/Y,2CAA2C;YAC3C,wNAAwN;YACxN,iLAAiL;YACjL,gGAAgG;YAChG,4dAA4d;YAC5d,kHAAkH;YAClH,0CAA0C;YAC1C,6FAA6F;YAC7F,iJAAiJ;YACjJ,6DAA6D;YAC7D,iDAAiD;YACjD,+NAA+N;YAC/N,6IAA6I;YAC7I,wGAAwG;YACxG,uCAAuC;YACvC,2KAA2K;YAC3K,yFAAyF;YACzF,mFAAmF;YACnF,kHAAkH;YAClH,gEAAgE;YAChE,gGAAgG;YAChG,+CAA+C;YAC/C,oEAAoE;YACpE,0EAA0E;YAC1E,gGAAgG;YAChG,sCAAsC;YACtC,mKAAmK;YACnK,gMAAgM;YAChM,8IAA8I;QAChJ,QAAQ,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAE,aAAa,EAAE,gBAAgB,EAAE,aAAa,EAAE,cAAc,EAAE,kBAAkB,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,CAAC;QAC5Y,YAAY,EAAE,CAAC,0BAA0B,EAAE,kBAAkB,CAAC;KAC/D;IACD;QACE,KAAK,EAAE,oBAAoB;QAC3B,KAAK,EAAE,uBAAuB;QAC9B,OAAO,EACL,uiBAAuiB;YACviB,uSAAuS;YACvS,oEAAoE;YACpE,8EAA8E;YAC9E,yCAAyC;YACzC,sCAAsC;YACtC,iFAAiF;YACjF,uCAAuC;YACvC,SAAS;YACT,4LAA4L;YAC5L,4MAA4M;QAC9M,QAAQ,EAAE,CAAC,cAAc,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC;QACxG,YAAY,EAAE,CAAC,kBAAkB,EAAE,oBAAoB,EAAE,YAAY,CAAC;KACvE;IACD;QACE,KAAK,EAAE,aAAa;QACpB,KAAK,EAAE,uBAAuB;QAC9B,OAAO,EACL,yWAAyW;QAC3W,QAAQ,EAAE,CAAC,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,kBAAkB,CAAC;QAC1F,YAAY,EAAE,CAAC,wBAAwB,EAAE,oBAAoB,CAAC;KAC/D;IACD;QACE,KAAK,EAAE,mBAAmB;QAC1B,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EACL,uVAAuV;QACzV,QAAQ,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,cAAc,CAAC;QACjG,YAAY,EAAE,CAAC,kBAAkB,CAAC;KACnC;IACD;QACE,KAAK,EAAE,sBAAsB;QAC7B,KAAK,EAAE,sBAAsB;QAC7B,OAAO,EACL,gQAAgQ;QAClQ,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC;QAC7E,YAAY,EAAE,CAAC,wBAAwB,CAAC;KACzC;IACD;QACE,KAAK,EAAE,wBAAwB;QAC/B,KAAK,EAAE,wBAAwB;QAC/B,OAAO,EACL,q7BAAq7B;YACr7B,+CAA+C;YAC/C,wWAAwW;YACxW,iDAAiD;YACjD,0NAA0N;YAC1N,wEAAwE;YACxE,oHAAoH;YACpH,6EAA6E;YAC7E,2MAA2M;YAC3M,uFAAuF;YACvF,mSAAmS;YACnS,8MAA8M;YAC9M,mNAAmN;YACnN,sFAAsF;YACtF,sIAAsI;YACtI,kNAAkN;YAClN,ubAAub;YACvb,uDAAuD;YACvD,yCAAyC;YACzC,iXAAiX;YACjX,4cAA4c;YAC5c,yHAAyH;YACzH,6BAA6B;YAC7B,6HAA6H;YAC7H,0HAA0H;YAC1H,gKAAgK;YAChK,iOAAiO;YACjO,8fAA8f;YAC9f,0XAA0X;QAC5X,QAAQ,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,cAAc,EAAE,UAAU,CAAC;QACpO,YAAY,EAAE,CAAC,wBAAwB,EAAE,oBAAoB,EAAE,aAAa,EAAE,YAAY,CAAC;KAC5F;IACD;QACE,KAAK,EAAE,kBAAkB;QACzB,KAAK,EAAE,kBAAkB;QACzB,OAAO,EACL,6eAA6e;QAC/e,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe,CAAC;QACxF,YAAY,EAAE,CAAC,aAAa,EAAE,oBAAoB,CAAC;KACpD;IACD;QACE,KAAK,EAAE,aAAa;QACpB,KAAK,EAAE,wBAAwB;QAC/B,OAAO,EACL,4kBAA4kB;QAC9kB,QAAQ,EAAE,CAAC,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC;QACvG,YAAY,EAAE,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,wBAAwB,CAAC;KAClF;IACD;QACE,KAAK,EAAE,aAAa;QACpB,KAAK,EAAE,aAAa;QACpB,OAAO,EACL,8gBAA8gB;QAChhB,QAAQ,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,cAAc,CAAC;QACvG,YAAY,EAAE,CAAC,oBAAoB,EAAE,wBAAwB,CAAC;KAC/D;IACD;QACE,KAAK,EAAE,sBAAsB;QAC7B,KAAK,EAAE,sBAAsB;QAC7B,OAAO,EACL,sYAAsY;QACxY,QAAQ,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC;QAC1E,YAAY,EAAE,CAAC,wBAAwB,EAAE,oBAAoB,EAAE,gBAAgB,CAAC;KACjF;IACD;QACE,KAAK,EAAE,mBAAmB;QAC1B,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EACL,wTAAwT;QAC1T,QAAQ,EAAE,CAAC,aAAa,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,CAAC;QAChF,YAAY,EAAE,CAAC,YAAY,CAAC;KAC7B;IACD;QACE,KAAK,EAAE,iBAAiB;QACxB,KAAK,EAAE,+BAA+B;QACtC,OAAO,EACL,+eAA+e;QACjf,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,mBAAmB,EAAE,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,KAAK,CAAC;QACnG,YAAY,EAAE,CAAC,oBAAoB,EAAE,qBAAqB,CAAC;KAC5D;IACD;QACE,KAAK,EAAE,cAAc;QACrB,KAAK,EAAE,gCAAgC;QACvC,OAAO,EACL,iRAAiR;YACjR,8BAA8B;YAC9B,gVAAgV;YAChV,gEAAgE;YAChE,uCAAuC;YACvC,6BAA6B;YAC7B,0WAA0W;YAC1W,+HAA+H;YAC/H,qPAAqP;YACrP,+TAA+T;YAC/T,6FAA6F;YAC7F,6CAA6C;YAC7C,uCAAuC;YACvC,oPAAoP;YACpP,+GAA+G;YAC/G,mMAAmM;YACnM,yDAAyD;YACzD,qEAAqE;YACrE,+RAA+R;YAC/R,4QAA4Q;YAC5Q,8LAA8L;YAC9L,sCAAsC;YACtC,2HAA2H;YAC3H,UAAU;YACV,0CAA0C;YAC1C,yIAAyI;YACzI,yFAAyF;YACzF,yCAAyC;YACzC,gMAAgM;YAChM,8KAA8K;YAC9K,oCAAoC;YACpC,+NAA+N;YAC/N,6KAA6K;YAC7K,mOAAmO;YACnO,yCAAyC;YACzC,qEAAqE;YACrE,gEAAgE;YAChE,gIAAgI;YAChI,uLAAuL;YACvL,gGAAgG;YAChG,sFAAsF;YACtF,kNAAkN;QACpN,QAAQ,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,cAAc,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,CAAC;QACnN,YAAY,EAAE,CAAC,0BAA0B,EAAE,UAAU,EAAE,kBAAkB,CAAC;KAC3E;IACD;QACE,KAAK,EAAE,6BAA6B;QACpC,KAAK,EAAE,sCAAsC;QAC7C,OAAO,EACL,gZAAgZ;QAClZ,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,CAAC;QACtF,YAAY,EAAE,CAAC,iBAAiB,EAAE,YAAY,CAAC;KAChD;IACD;QACE,KAAK,EAAE,eAAe;QACtB,KAAK,EAAE,eAAe;QACtB,OAAO,EACL,4uBAA4uB;QAC9uB,QAAQ,EAAE,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,sBAAsB,CAAC;QAC5H,YAAY,EAAE,CAAC,0BAA0B,CAAC;KAC3C;IACD;QACE,KAAK,EAAE,yBAAyB;QAChC,KAAK,EAAE,oCAAoC;QAC3C,OAAO,EAAE,0BAA0B;QACnC,QAAQ,EAAE;YACR,WAAW;YACX,YAAY;YACZ,YAAY;YACZ,gBAAgB;YAChB,aAAa;YACb,oBAAoB;YACpB,iBAAiB;YACjB,oBAAoB;YACpB,UAAU;YACV,SAAS;YACT,eAAe;YACf,SAAS;YACT,iBAAiB;YACjB,SAAS;YACT,SAAS;SACV;QACD,YAAY,EAAE,CAAC,0BAA0B,CAAC;KAC3C;IACD;QACE,KAAK,EAAE,6BAA6B;QACpC,KAAK,EAAE,wCAAwC;QAC/C,OAAO,EACL,gMAAgM;YAChM,0PAA0P;YAC1P,wlBAAwlB;YACxlB,2dAA2d;YAC3d,seAAse;YACte,kcAAkc;YAClc,4aAA4a;QAC9a,QAAQ,EAAE;YACR,WAAW;YACX,WAAW;YACX,UAAU;YACV,UAAU;YACV,WAAW;YACX,kBAAkB;YAClB,eAAe;YACf,oBAAoB;YACpB,kBAAkB;YAClB,SAAS;YACT,YAAY;YACZ,UAAU;YACV,YAAY;YACZ,SAAS;YACT,aAAa;YACb,gBAAgB;YAChB,mBAAmB;YACnB,iBAAiB;YACjB,iBAAiB;YACjB,UAAU;SACX;QACD,YAAY,EAAE,CAAC,wBAAwB,EAAE,oBAAoB,EAAE,0BAA0B,CAAC;KAC3F;IACD;QACE,KAAK,EAAE,wBAAwB;QAC/B,KAAK,EAAE,2CAA2C;QAClD,OAAO,EACL,y5BAAy5B;QAC35B,QAAQ,EAAE;YACR,WAAW;YACX,UAAU;YACV,WAAW;YACX,OAAO;YACP,QAAQ;YACR,cAAc;YACd,aAAa;YACb,OAAO;YACP,WAAW;YACX,aAAa;YACb,KAAK;YACL,yBAAyB;YACzB,WAAW;YACX,UAAU;SACX;QACD,YAAY,EAAE,CAAC,wBAAwB,CAAC;KACzC;IACD;QACE,KAAK,EAAE,kBAAkB;QACzB,KAAK,EAAE,4CAA4C;QACnD,OAAO,EACL,4zCAA4zC;QAC9zC,QAAQ,EAAE;YACR,MAAM;YACN,aAAa;YACb,YAAY;YACZ,UAAU;YACV,kBAAkB;YAClB,eAAe;YACf,OAAO;YACP,WAAW;YACX,QAAQ;YACR,cAAc;YACd,WAAW;YACX,QAAQ;YACR,MAAM;YACN,SAAS;SACV;QACD,YAAY,EAAE,CAAC,wBAAwB,EAAE,kBAAkB,CAAC;KAC7D;CACF,CAAC;AAEF,MAAM,UAAU,eAAe,CAAC,KAAa,EAAE,WAAoB;IACjE,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5F,IAAI,CAAC,CAAC;QAAE,OAAO,QAAQ,CAAC;IACxB,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACpC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,MAAM,GAAG,GAAG,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC;QACvG,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,IAAI,KAAK,CAAC,KAAK,KAAK,CAAC;gBAAE,KAAK,IAAI,EAAE,CAAC;YACnC,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAAE,KAAK,IAAI,EAAE,CAAC;YACzC,IAAI,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAAE,KAAK,IAAI,CAAC,CAAC;YACtD,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAChC,IAAI,EAAE,KAAK,CAAC;oBAAE,KAAK,IAAI,CAAC,CAAC;qBACpB,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;oBAAE,KAAK,IAAI,CAAC,CAAC;YACtC,CAAC;YACD,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YAC5C,IAAI,WAAW,GAAG,CAAC;gBAAE,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IACjF,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateConsumer.d.ts","sourceRoot":"","sources":["../../../src/tools/handlers/generateConsumer.ts"],"names":[],"mappings":"AA8BA,OAAO,EAA6B,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"generateConsumer.d.ts","sourceRoot":"","sources":["../../../src/tools/handlers/generateConsumer.ts"],"names":[],"mappings":"AA8BA,OAAO,EAA6B,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AA8G5E,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,CAK/D"}
|
|
@@ -17,25 +17,49 @@ import { applyManifestPatch, manifestPath, } from "../util/manifest.js";
|
|
|
17
17
|
import { okResponse, errorResponse } from "../response.js";
|
|
18
18
|
import { hashGeneratedContent } from "../util/generatedHash.js";
|
|
19
19
|
import { mergeUserCodeBlocks } from "../util/userCodeMerge.js";
|
|
20
|
+
// Compute "names that were tracked by the spec/integration last time but
|
|
21
|
+
// aren't tracked now" from a manifest snapshot. Used as
|
|
22
|
+
// MergeOptions.removedTrackedNames so the merge utility can correctly
|
|
23
|
+
// distinguish (a) USER-CODE blocks for handlers/streams that were just
|
|
24
|
+
// removed from the spec — TRUE orphans — from (b) developer-created shared
|
|
25
|
+
// utility blocks that the template never knew about (preserved silently).
|
|
26
|
+
// See util/userCodeMerge.ts MergeOptions.removedTrackedNames for rationale.
|
|
27
|
+
function removedTrackedNamesFromManifest(manifest, newTrackedNames) {
|
|
28
|
+
if (!manifest)
|
|
29
|
+
return [];
|
|
30
|
+
const integration = manifest.integration;
|
|
31
|
+
if (!integration)
|
|
32
|
+
return [];
|
|
33
|
+
const previousHandlers = Array.isArray(integration.handlerNames)
|
|
34
|
+
? integration.handlerNames.filter((n) => typeof n === "string")
|
|
35
|
+
: [];
|
|
36
|
+
const previousStreams = Array.isArray(integration.streams)
|
|
37
|
+
? integration.streams.filter((n) => typeof n === "string")
|
|
38
|
+
: [];
|
|
39
|
+
const previous = new Set([...previousHandlers, ...previousStreams, "imports"]);
|
|
40
|
+
const next = new Set([...newTrackedNames, "imports"]);
|
|
41
|
+
return [...previous].filter((n) => !next.has(n));
|
|
42
|
+
}
|
|
20
43
|
// Server-side USER-CODE merge for create_or_merge files. When projectPath is
|
|
21
44
|
// provided AND the file exists, splice existing USER-CODE bodies into the
|
|
22
45
|
// new content, upgrade action to "write" (no agent merge needed), and return
|
|
23
46
|
// the merged content. Otherwise return raw — agent runs the legacy merge.
|
|
24
47
|
// See util/userCodeMerge.ts for the full contract.
|
|
25
|
-
function applyServerSideMerge(raw, projectPath) {
|
|
48
|
+
function applyServerSideMerge(raw, projectPath, removedTrackedNames = []) {
|
|
26
49
|
if (!projectPath)
|
|
27
50
|
return { content: raw.content, action: "create_or_merge" };
|
|
28
51
|
const abs = join(projectPath, raw.path);
|
|
29
52
|
if (!existsSync(abs))
|
|
30
53
|
return { content: raw.content, action: "create_or_merge" };
|
|
31
54
|
const existing = readFileSync(abs, "utf8");
|
|
32
|
-
const result = mergeUserCodeBlocks(existing, raw.content);
|
|
55
|
+
const result = mergeUserCodeBlocks(existing, raw.content, { removedTrackedNames });
|
|
33
56
|
return {
|
|
34
57
|
content: result.merged,
|
|
35
58
|
action: "write",
|
|
36
59
|
mergeReport: {
|
|
37
60
|
preserved: result.preserved,
|
|
38
61
|
orphaned: result.orphaned,
|
|
62
|
+
extra: result.extra,
|
|
39
63
|
warnings: result.warnings,
|
|
40
64
|
},
|
|
41
65
|
};
|
|
@@ -68,7 +92,13 @@ function buildCallback(args) {
|
|
|
68
92
|
const rawCallbacksContent = args.platform === "android"
|
|
69
93
|
? renderAndroidCallbacksRich(args.appPackage, args.handlers, concise)
|
|
70
94
|
: renderIosCallbacksRich(args.handlers, concise);
|
|
71
|
-
|
|
95
|
+
// F-R3-6: compute names that were tracked last cycle but are absent from
|
|
96
|
+
// this call's args. Anything in the existing file matching one of these is
|
|
97
|
+
// a TRUE orphan (handler removed from spec) — gets the ORPHANED label.
|
|
98
|
+
// Anything else in-existing-only is a developer-created shared block and
|
|
99
|
+
// is preserved silently.
|
|
100
|
+
const removedHandlerNames = removedTrackedNamesFromManifest(args.currentManifest, args.handlers.map((h) => h.name));
|
|
101
|
+
const callbacksMerged = applyServerSideMerge({ path: callbacksPath, content: rawCallbacksContent }, args.projectPath, removedHandlerNames);
|
|
72
102
|
if (callbacksMerged.action === "write") {
|
|
73
103
|
files.push({
|
|
74
104
|
path: callbacksPath,
|
|
@@ -162,7 +192,15 @@ function buildStream(args) {
|
|
|
162
192
|
const rawStreamsContent = args.platform === "android"
|
|
163
193
|
? renderAndroidStreams(args.appPackage, args.streams, args.scope, concise)
|
|
164
194
|
: renderIosStreams(args.streams, args.scope, concise);
|
|
165
|
-
|
|
195
|
+
// F-R3-6: stream consumer block names are derived from stream IDs
|
|
196
|
+
// (s.id), but the manifest currently records `integration.streams` as
|
|
197
|
+
// stream TYPES, not IDs — so we can't reconstruct "removed stream IDs"
|
|
198
|
+
// from the manifest diff alone. Pass an empty list: any in-existing-but-
|
|
199
|
+
// not-in-next blocks are preserved silently (no spurious ORPHANED label).
|
|
200
|
+
// Trade-off chosen: under-flagging > mis-flagging dev-owned utility
|
|
201
|
+
// blocks (which was the F-R3-6 production bug). When manifest gains an
|
|
202
|
+
// integration.streamIds field, switch to a real diff here.
|
|
203
|
+
const streamsMerged = applyServerSideMerge({ path: streamsPath, content: rawStreamsContent }, args.projectPath, []);
|
|
166
204
|
if (streamsMerged.action === "write") {
|
|
167
205
|
files.push({
|
|
168
206
|
path: streamsPath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateConsumer.js","sourceRoot":"","sources":["../../../src/tools/handlers/generateConsumer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generateConsumer.js","sourceRoot":"","sources":["../../../src/tools/handlers/generateConsumer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initSpec.d.ts","sourceRoot":"","sources":["../../../src/tools/handlers/initSpec.ts"],"names":[],"mappings":"AAyBA,OAAO,EAA6B,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"initSpec.d.ts","sourceRoot":"","sources":["../../../src/tools/handlers/initSpec.ts"],"names":[],"mappings":"AAyBA,OAAO,EAA6B,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AA2B5E,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,CA8GvD"}
|
|
@@ -46,7 +46,12 @@ export function handleInitSpec(raw) {
|
|
|
46
46
|
// to "write" (verbatim) and the manifest hash is recomputed over the merged
|
|
47
47
|
// content so live-vs-recorded matches by construction. See
|
|
48
48
|
// util/userCodeMerge.ts for the full contract.
|
|
49
|
-
|
|
49
|
+
//
|
|
50
|
+
// F-R3-6: compute removed handler names from the manifest diff so true
|
|
51
|
+
// orphans (handler removed from spec) get the ORPHANED label, while
|
|
52
|
+
// developer-created shared utility blocks are preserved silently.
|
|
53
|
+
const removedHandlerNames = removedTrackedNamesFromManifest(args.currentManifest, handlerNames);
|
|
54
|
+
const files = rawFiles.map((f) => maybeMerge(f, args.projectPath, removedHandlerNames));
|
|
50
55
|
const specPath = specPathFor(args.platform, args.appPackage);
|
|
51
56
|
const permissionsDelta = args.platform === "android"
|
|
52
57
|
? {
|
|
@@ -194,18 +199,36 @@ function parseArgs(raw) {
|
|
|
194
199
|
},
|
|
195
200
|
};
|
|
196
201
|
}
|
|
202
|
+
// Compute names that were tracked by the spec last cycle (per the manifest)
|
|
203
|
+
// but aren't tracked now — the diff that lets the merge utility decide which
|
|
204
|
+
// in-existing-only USER-CODE blocks are TRUE orphans (handler removed from
|
|
205
|
+
// spec; gets ORPHANED label) vs developer-created shared utility blocks
|
|
206
|
+
// (preserved silently). See util/userCodeMerge.ts MergeOptions.
|
|
207
|
+
function removedTrackedNamesFromManifest(manifest, newHandlerNames) {
|
|
208
|
+
if (!manifest)
|
|
209
|
+
return [];
|
|
210
|
+
const integration = manifest.integration;
|
|
211
|
+
if (!integration)
|
|
212
|
+
return [];
|
|
213
|
+
const previousHandlers = Array.isArray(integration.handlerNames)
|
|
214
|
+
? integration.handlerNames.filter((n) => typeof n === "string")
|
|
215
|
+
: [];
|
|
216
|
+
const previous = new Set([...previousHandlers, "imports"]);
|
|
217
|
+
const next = new Set([...newHandlerNames, "imports"]);
|
|
218
|
+
return [...previous].filter((n) => !next.has(n));
|
|
219
|
+
}
|
|
197
220
|
// If projectPath is provided AND the file exists on disk, run server-side
|
|
198
221
|
// USER-CODE merge. Action becomes "write" (no agent merge needed). When
|
|
199
222
|
// projectPath is omitted or the file doesn't exist, return the raw file
|
|
200
223
|
// unchanged — agent uses the legacy create_or_merge path.
|
|
201
|
-
function maybeMerge(raw, projectPath) {
|
|
224
|
+
function maybeMerge(raw, projectPath, removedTrackedNames = []) {
|
|
202
225
|
if (!projectPath)
|
|
203
226
|
return { ...raw };
|
|
204
227
|
const abs = join(projectPath, raw.path);
|
|
205
228
|
if (!existsSync(abs))
|
|
206
229
|
return { ...raw };
|
|
207
230
|
const existing = readFileSync(abs, "utf8");
|
|
208
|
-
const result = mergeUserCodeBlocks(existing, raw.content);
|
|
231
|
+
const result = mergeUserCodeBlocks(existing, raw.content, { removedTrackedNames });
|
|
209
232
|
return {
|
|
210
233
|
path: raw.path,
|
|
211
234
|
content: result.merged,
|
|
@@ -213,6 +236,7 @@ function maybeMerge(raw, projectPath) {
|
|
|
213
236
|
mergeReport: {
|
|
214
237
|
preserved: result.preserved,
|
|
215
238
|
orphaned: result.orphaned,
|
|
239
|
+
extra: result.extra,
|
|
216
240
|
warnings: result.warnings,
|
|
217
241
|
},
|
|
218
242
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initSpec.js","sourceRoot":"","sources":["../../../src/tools/handlers/initSpec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"initSpec.js","sourceRoot":"","sources":["../../../src/tools/handlers/initSpec.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,22 @@ export interface MergeWarning {
|
|
|
3
3
|
name: string;
|
|
4
4
|
detail: string;
|
|
5
5
|
}
|
|
6
|
+
export interface MergeOptions {
|
|
7
|
+
/**
|
|
8
|
+
* Names that were tracked by the spec (handler names, stream ids) but are
|
|
9
|
+
* being removed in this generation cycle. The caller computes this from
|
|
10
|
+
* the manifest's previous `integration.handlerNames` / `integration.streams`
|
|
11
|
+
* minus the new args. When a USER-CODE block in `existing` matches one of
|
|
12
|
+
* these names AND doesn't appear in `next`, it's a TRUE orphan — body
|
|
13
|
+
* preserved at end of file with an `// ORPHANED:<name>` annotation, and
|
|
14
|
+
* the name appears in `MergeResult.orphaned`. Other blocks
|
|
15
|
+
* in-existing-but-not-in-next are user-owned (developer-created shared
|
|
16
|
+
* utility blocks); they're preserved silently and listed in
|
|
17
|
+
* `MergeResult.extra` for transparency. Default `[]` (no orphan annotation
|
|
18
|
+
* applied; everything in-existing-only is treated as user-owned).
|
|
19
|
+
*/
|
|
20
|
+
removedTrackedNames?: string[];
|
|
21
|
+
}
|
|
6
22
|
export interface MergeResult {
|
|
7
23
|
/** The merged file content. Write this verbatim to disk. */
|
|
8
24
|
merged: string;
|
|
@@ -10,8 +26,25 @@ export interface MergeResult {
|
|
|
10
26
|
hash: string;
|
|
11
27
|
/** Block names whose existing body was preserved into the new content. */
|
|
12
28
|
preserved: string[];
|
|
13
|
-
/**
|
|
29
|
+
/**
|
|
30
|
+
* Block names that were in `existing` but no longer in `next` AND matched
|
|
31
|
+
* `options.removedTrackedNames`. These represent code whose HANDLER /
|
|
32
|
+
* STREAM was just removed from the spec — body kept at end-of-file with an
|
|
33
|
+
* `// ORPHANED:<name>` annotation so the dev can review and either delete
|
|
34
|
+
* or re-add the spec entry. Empty when caller doesn't pass
|
|
35
|
+
* removedTrackedNames.
|
|
36
|
+
*/
|
|
14
37
|
orphaned: string[];
|
|
38
|
+
/**
|
|
39
|
+
* Block names that were in `existing` but no longer in `next` AND did NOT
|
|
40
|
+
* match `options.removedTrackedNames`. These are user-owned blocks
|
|
41
|
+
* (developer-created shared utility blocks the template never knew about).
|
|
42
|
+
* Body preserved silently at end-of-file with no annotation — no orphan
|
|
43
|
+
* comment, just the bare USER-CODE-START / USER-CODE-END markers. The
|
|
44
|
+
* report field exists for transparency; agents typically don't need to
|
|
45
|
+
* surface it to the dev.
|
|
46
|
+
*/
|
|
47
|
+
extra: string[];
|
|
15
48
|
/** Soft warnings (corrupt input, duplicate block names). Merge continues; agent surfaces these to the dev. */
|
|
16
49
|
warnings: MergeWarning[];
|
|
17
50
|
}
|
|
@@ -23,11 +56,14 @@ export interface MergeResult {
|
|
|
23
56
|
* 2. Walk `next`, replace each block's body with the existing body if the
|
|
24
57
|
* name matches. Track preserved names.
|
|
25
58
|
* 3. Any names in `existing` not present in `next` are appended at end-of-file
|
|
26
|
-
* as
|
|
27
|
-
*
|
|
59
|
+
* as USER-CODE blocks. If the name appears in
|
|
60
|
+
* `options.removedTrackedNames` it's prefixed with `// ORPHANED:<name>`
|
|
61
|
+
* and listed in `orphaned[]`. Otherwise it's appended bare and listed in
|
|
62
|
+
* `extra[]`.
|
|
28
63
|
*
|
|
29
64
|
* Pure function. Safe to call repeatedly. Stable output: same inputs →
|
|
30
|
-
* identical output (and identical hash).
|
|
65
|
+
* identical output (and identical hash). Idempotent: merging the merged
|
|
66
|
+
* output against itself produces the same content.
|
|
31
67
|
*/
|
|
32
|
-
export declare function mergeUserCodeBlocks(existing: string, next: string): MergeResult;
|
|
68
|
+
export declare function mergeUserCodeBlocks(existing: string, next: string, options?: MergeOptions): MergeResult;
|
|
33
69
|
//# sourceMappingURL=userCodeMerge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userCodeMerge.d.ts","sourceRoot":"","sources":["../../../src/tools/util/userCodeMerge.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"userCodeMerge.d.ts","sourceRoot":"","sources":["../../../src/tools/util/userCodeMerge.ts"],"names":[],"mappings":"AA4DA,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,YAAY;IAC3B;;;;;;;;;;;;OAYG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,WAAW;IAC1B,4DAA4D;IAC5D,MAAM,EAAE,MAAM,CAAC;IACf,oEAAoE;IACpE,IAAI,EAAE,MAAM,CAAC;IACb,0EAA0E;IAC1E,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB;;;;;;;OAOG;IACH,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB;;;;;;;;OAQG;IACH,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,8GAA8G;IAC9G,QAAQ,EAAE,YAAY,EAAE,CAAC;CAC1B;AAOD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,YAAiB,GACzB,WAAW,CA+Eb"}
|
|
@@ -21,7 +21,28 @@
|
|
|
21
21
|
// <body — any content, may span lines>
|
|
22
22
|
// <leading-indent>// USER-CODE-END:<name>\n
|
|
23
23
|
// The leading `//` works for both Kotlin and Swift. `<name>` is a stable
|
|
24
|
-
// identifier (handler name, stream id,
|
|
24
|
+
// identifier (handler name, stream id, the literal `imports`, OR any
|
|
25
|
+
// developer-chosen name for shared utility blocks).
|
|
26
|
+
//
|
|
27
|
+
// F-R3-6 fix (2026-05-03): two regressions in the original orphan logic
|
|
28
|
+
// - Bug A (semantic): blocks present in the existing file but not in the
|
|
29
|
+
// new template were unconditionally labeled `ORPHANED`. This was wrong:
|
|
30
|
+
// developers can (and do) add their own USER-CODE blocks for shared
|
|
31
|
+
// utility code (e.g. an `// USER-CODE-START:helpers` block holding HTTP
|
|
32
|
+
// clients and parsing helpers shared across handlers). These are NOT
|
|
33
|
+
// orphans — they're user-owned code that the template never knew about.
|
|
34
|
+
// A real orphan is "a USER-CODE block whose corresponding HANDLER /
|
|
35
|
+
// STREAM was just removed from the spec," and that requires external
|
|
36
|
+
// knowledge (the spec diff) the merge utility doesn't have on its own.
|
|
37
|
+
// - Bug B (syntactic): the orphan re-insertion path produced
|
|
38
|
+
// `// USER-CODE-START:helpersprivate const val TAG = ...` — missing
|
|
39
|
+
// newline between the START marker and the body's first line. The
|
|
40
|
+
// resulting file failed to compile. Caller often surfaces "action:
|
|
41
|
+
// write" as a directive — writing this verbatim broke the dev's project.
|
|
42
|
+
// Fix: add explicit `removedTrackedNames` option so the caller (which knows
|
|
43
|
+
// the spec diff) opts into the orphan label. Default behavior preserves
|
|
44
|
+
// every USER-CODE block silently. Re-insertion path always uses correct
|
|
45
|
+
// newlines.
|
|
25
46
|
import { hashGeneratedContent } from "./generatedHash.js";
|
|
26
47
|
// Anchored on the START line (with its trailing newline) and the END line
|
|
27
48
|
// (preceded by the body's terminating newline). The body capture is
|
|
@@ -41,14 +62,18 @@ const BLOCK_RE = /(\/\/\s*USER-CODE-START:([^\n]+)\n)([\s\S]*?)(\n[ \t]*\/\/\s*U
|
|
|
41
62
|
* 2. Walk `next`, replace each block's body with the existing body if the
|
|
42
63
|
* name matches. Track preserved names.
|
|
43
64
|
* 3. Any names in `existing` not present in `next` are appended at end-of-file
|
|
44
|
-
* as
|
|
45
|
-
*
|
|
65
|
+
* as USER-CODE blocks. If the name appears in
|
|
66
|
+
* `options.removedTrackedNames` it's prefixed with `// ORPHANED:<name>`
|
|
67
|
+
* and listed in `orphaned[]`. Otherwise it's appended bare and listed in
|
|
68
|
+
* `extra[]`.
|
|
46
69
|
*
|
|
47
70
|
* Pure function. Safe to call repeatedly. Stable output: same inputs →
|
|
48
|
-
* identical output (and identical hash).
|
|
71
|
+
* identical output (and identical hash). Idempotent: merging the merged
|
|
72
|
+
* output against itself produces the same content.
|
|
49
73
|
*/
|
|
50
|
-
export function mergeUserCodeBlocks(existing, next) {
|
|
74
|
+
export function mergeUserCodeBlocks(existing, next, options = {}) {
|
|
51
75
|
const warnings = [];
|
|
76
|
+
const removedTracked = new Set(options.removedTrackedNames ?? []);
|
|
52
77
|
const existingBlocks = extractBlocks(existing, warnings);
|
|
53
78
|
const existingByName = new Map();
|
|
54
79
|
for (const b of existingBlocks) {
|
|
@@ -76,28 +101,44 @@ export function mergeUserCodeBlocks(existing, next) {
|
|
|
76
101
|
preserved.push(name);
|
|
77
102
|
return `${startLine}${existingBody}${endLine}`;
|
|
78
103
|
});
|
|
79
|
-
|
|
104
|
+
// Names in existing-but-not-next: split into orphans (the caller told us
|
|
105
|
+
// these were tracked names being removed) and extras (everything else,
|
|
106
|
+
// assumed to be user-owned shared utility blocks).
|
|
107
|
+
const inExistingNotInNext = [...existingByName.keys()]
|
|
80
108
|
.filter((name) => !seenInNext.has(name))
|
|
81
109
|
.sort();
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
110
|
+
const orphanNames = inExistingNotInNext.filter((name) => removedTracked.has(name));
|
|
111
|
+
const extraNames = inExistingNotInNext.filter((name) => !removedTracked.has(name));
|
|
112
|
+
let withAppended = merged;
|
|
113
|
+
if (orphanNames.length || extraNames.length) {
|
|
114
|
+
// F-R3-6 fix: ensure proper newlines between marker, body, and end
|
|
115
|
+
// marker. The prior implementation concatenated `START:${name}` and
|
|
116
|
+
// `${body}` directly — but body has no leading newline (the START's
|
|
117
|
+
// newline is captured in $1, not $3), so the output became
|
|
118
|
+
// `// USER-CODE-START:helpersprivate const val TAG = ...`. Always emit
|
|
119
|
+
// an explicit `\n` between the START marker and the body.
|
|
120
|
+
const renderBlock = (name, body, asOrphan) => {
|
|
121
|
+
const lead = asOrphan
|
|
122
|
+
? `\n// ORPHANED:${name} — handler/stream removed from spec; review and delete, ` +
|
|
123
|
+
`or re-add to the spec to restore.\n`
|
|
124
|
+
: `\n`;
|
|
125
|
+
return (`${lead}` +
|
|
126
|
+
`// USER-CODE-START:${name}\n` +
|
|
127
|
+
`${body}\n` +
|
|
128
|
+
`// USER-CODE-END:${name}\n`);
|
|
129
|
+
};
|
|
130
|
+
const appended = orphanNames.map((n) => renderBlock(n, existingByName.get(n) ?? "", true)).join("") +
|
|
131
|
+
extraNames.map((n) => renderBlock(n, existingByName.get(n) ?? "", false)).join("");
|
|
92
132
|
// Trim a single trailing newline if present so we don't accumulate blanks
|
|
93
|
-
// across repeated merges
|
|
94
|
-
|
|
133
|
+
// across repeated merges.
|
|
134
|
+
withAppended = `${merged.replace(/\n+$/, "\n")}${appended}`;
|
|
95
135
|
}
|
|
96
136
|
return {
|
|
97
|
-
merged:
|
|
98
|
-
hash: hashGeneratedContent(
|
|
137
|
+
merged: withAppended,
|
|
138
|
+
hash: hashGeneratedContent(withAppended),
|
|
99
139
|
preserved: preserved.sort(),
|
|
100
140
|
orphaned: orphanNames,
|
|
141
|
+
extra: extraNames,
|
|
101
142
|
warnings,
|
|
102
143
|
};
|
|
103
144
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userCodeMerge.js","sourceRoot":"","sources":["../../../src/tools/util/userCodeMerge.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,EAAE;AACF,wEAAwE;AACxE,6DAA6D;AAC7D,4EAA4E;AAC5E,6EAA6E;AAC7E,4EAA4E;AAC5E,yEAAyE;AACzE,0EAA0E;AAC1E,gBAAgB;AAChB,EAAE;AACF,kEAAkE;AAClE,4EAA4E;AAC5E,0EAA0E;AAC1E,wEAAwE;AACxE,8EAA8E;AAC9E,qEAAqE;AACrE,EAAE;AACF,sFAAsF;AACtF,gDAAgD;AAChD,2CAA2C;AAC3C,8CAA8C;AAC9C,yEAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"userCodeMerge.js","sourceRoot":"","sources":["../../../src/tools/util/userCodeMerge.ts"],"names":[],"mappings":"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"}
|