@lingjingai/scriptctl 0.53.2 → 0.53.4
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/changes/0.53.3.md +15 -0
- package/changes/0.53.4.md +14 -0
- package/dist/domain/authoring/v4/apply.js +14 -14
- package/dist/domain/authoring/v4/apply.js.map +1 -1
- package/dist/domain/script/dispatch.d.ts +2 -0
- package/dist/domain/script/dispatch.js +6 -1
- package/dist/domain/script/dispatch.js.map +1 -1
- package/dist/domain/script/shared/validation.d.ts +2 -0
- package/dist/domain/script/shared/validation.js +22 -1
- package/dist/domain/script/shared/validation.js.map +1 -1
- package/dist/domain/script/text-util.js +5 -1
- package/dist/domain/script/text-util.js.map +1 -1
- package/dist/domain/script/v3/patch/helpers.d.ts +0 -2
- package/dist/domain/script/v3/patch/helpers.js +0 -54
- package/dist/domain/script/v3/patch/helpers.js.map +1 -1
- package/dist/domain/script/v3/patch/ops-action.js +1 -13
- package/dist/domain/script/v3/patch/ops-action.js.map +1 -1
- package/dist/domain/script/v3/patch/ops-asset.js +0 -18
- package/dist/domain/script/v3/patch/ops-asset.js.map +1 -1
- package/dist/domain/script/v3/patch/ops-dialogue.js +0 -5
- package/dist/domain/script/v3/patch/ops-dialogue.js.map +1 -1
- package/dist/domain/script/v3/patch/ops-state.js +0 -10
- package/dist/domain/script/v3/patch/ops-state.js.map +1 -1
- package/dist/domain/script/v3/validation.js +22 -5
- package/dist/domain/script/v3/validation.js.map +1 -1
- package/dist/domain/script/v4/parse.d.ts +1 -0
- package/dist/domain/script/v4/parse.js +173 -12
- package/dist/domain/script/v4/parse.js.map +1 -1
- package/dist/domain/script/v4/patch/ops-action.js +0 -25
- package/dist/domain/script/v4/patch/ops-action.js.map +1 -1
- package/dist/domain/script/v4/patch/ops-asset.js +6 -67
- package/dist/domain/script/v4/patch/ops-asset.js.map +1 -1
- package/dist/domain/script/v4/patch/ops-scene-ref.js +0 -24
- package/dist/domain/script/v4/patch/ops-scene-ref.js.map +1 -1
- package/dist/domain/script/v4/validation.js +26 -4
- package/dist/domain/script/v4/validation.js.map +1 -1
- package/dist/usecases/script/actions.js +2 -2
- package/dist/usecases/script/actions.js.map +1 -1
- package/dist/usecases/script/actors.js +2 -2
- package/dist/usecases/script/actors.js.map +1 -1
- package/dist/usecases/script/assets.js +2 -2
- package/dist/usecases/script/assets.js.map +1 -1
- package/dist/usecases/script/do.js +12 -10
- package/dist/usecases/script/do.js.map +1 -1
- package/dist/usecases/script/episodes.js +2 -2
- package/dist/usecases/script/episodes.js.map +1 -1
- package/dist/usecases/script/export-authoring.js +4 -4
- package/dist/usecases/script/export-authoring.js.map +1 -1
- package/dist/usecases/script/extend.js +2 -2
- package/dist/usecases/script/extend.js.map +1 -1
- package/dist/usecases/script/ids.js +2 -2
- package/dist/usecases/script/ids.js.map +1 -1
- package/dist/usecases/script/lib.js +15 -9
- package/dist/usecases/script/lib.js.map +1 -1
- package/dist/usecases/script/locations.js +2 -2
- package/dist/usecases/script/locations.js.map +1 -1
- package/dist/usecases/script/props.js +2 -2
- package/dist/usecases/script/props.js.map +1 -1
- package/dist/usecases/script/refs.js +2 -2
- package/dist/usecases/script/refs.js.map +1 -1
- package/dist/usecases/script/scenes.js +2 -2
- package/dist/usecases/script/scenes.js.map +1 -1
- package/dist/usecases/script/script-patch.js +11 -10
- package/dist/usecases/script/script-patch.js.map +1 -1
- package/dist/usecases/script/session.d.ts +1 -0
- package/dist/usecases/script/session.js +44 -13
- package/dist/usecases/script/session.js.map +1 -1
- package/dist/usecases/script/states.js +2 -2
- package/dist/usecases/script/states.js.map +1 -1
- package/dist/usecases/script/synopsis-generate.js +2 -2
- package/dist/usecases/script/synopsis-generate.js.map +1 -1
- package/dist/usecases/script/write-authoring.js +6 -4
- package/dist/usecases/script/write-authoring.js.map +1 -1
- package/package.json +1 -1
- package/skills/scriptctl/SKILL.md +14 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../src/usecases/script/actions.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAGR,OAAO,EAEP,UAAU,GASX,MAAM,iBAAiB,CAAC;AA6BzB,OAAO,EACL,MAAM,EAIN,KAAK,GACN,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,iBAAiB,GAElB,MAAM,cAAc,CAAC;AACtB,OAAO,EACqF,aAAa,EAAE,mBAAmB,EAAE,mBAAmB,EAAsI,gBAAgB,EAAwF,oBAAoB,GACpZ,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../src/usecases/script/actions.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAGR,OAAO,EAEP,UAAU,GASX,MAAM,iBAAiB,CAAC;AA6BzB,OAAO,EACL,MAAM,EAIN,KAAK,GACN,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,iBAAiB,GAElB,MAAM,cAAc,CAAC;AACtB,OAAO,EACqF,aAAa,EAAE,mBAAmB,EAAE,mBAAmB,EAAsI,gBAAgB,EAAwF,oBAAoB,GACpZ,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mCAAmC,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,EACL,qBAAqB,EACrB,cAAc,EACd,sBAAsB,GACvB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAU;IAC7C,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC9B,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE;QACrB,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;QAC1B,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE;YAAE,OAAO,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACzB,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,cAAc,GAAG,OAAO,CAC5B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;WACrB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE;WAC1B,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE;WAC1B,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE;WAC3B,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE;WACzB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAC9B,CAAC;IACF,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,IAAI,QAAQ,CAAC,yBAAyB,EAAE;YACtC,QAAQ,EAAE,UAAU;YACpB,SAAS,EAAE,wBAAwB;YACnC,IAAI,EAAE,uEAAuE;YAC7E,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,mEAAmE,CAAC,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE;SAC/G,CAAC,CAAC;IACX,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,mCAAmC,CAAC,MAAM,CAAC,CAAC;QAC7D,MAAM,UAAU,GAAG,sBAAsB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;QACxE,IAAI,SAAS,GAAG,UAAU,CAAC;QAC3B,IAAI,QAAQ,GAAG,CAAC,IAAI,QAAQ,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACtC,MAAM,eAAe,GAAG,IAAI,GAAG,EAG3B,CAAC;YACL,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;gBAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC;gBACrC,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI;oBAC/C,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO;oBAC5B,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;iBACvE,CAAC;gBACF,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,WAAW,GAAG,QAAQ,CAAC,CAAC;gBACxD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,CAAC,WAAW,GAAG,QAAQ,CAAC,CAAC;gBACnF,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAE,GAAG,CAAC,CAAC;gBACnD,QAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAE,GAAG,CAAC,CAAC;gBACvD,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACzC,CAAC;YACD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;YAC3C,KAAK,MAAM,QAAQ,IAAI,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC;gBAChD,IAAI,MAAM,GAAG,CAAC,CAAC;gBACf,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;oBACzC,MAAM,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAE,CAAC;oBACjC,IAAI,MAAM,GAAG,CAAC;wBAAE,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBACzD,CAAC,CAAC,CAAC;YACL,CAAC;YACD,SAAS,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CACzD,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG;YACjB,MAAM;YACN,OAAO;YACP,UAAU;YACV,iBAAiB;YACjB,WAAW;YACX,kBAAkB;YAClB,WAAW;YACX,MAAM;YACN,SAAS;YACT,OAAO;YACP,eAAe;YACf,SAAS;SACV,CAAC;QACF,OAAO;YACL,gBAAgB,CAAC,eAAe,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YAC1F,OAAO;SACR,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAS;QACtB,GAAG,IAAI;QACP,EAAE,EAAE,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;KACjD,CAAC;IACF,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,IAAI,GAAG,CAAS,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAE5F,8EAA8E;IAC9E,4EAA4E;IAC5E,yEAAyE;IACzE,IAAI,SAAyB,CAAC;IAC9B,IAAI,QAAQ,GAAG,CAAC,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QACvC,SAAS,GAAG,EAAE,CAAC;QACf,MAAM,eAAe,GAAG,IAAI,GAAG,EAAuB,CAAC;QACvD,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;YAC1B,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrC,MAAM,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,KAAM,CAAC,IAAI,IAAI,GAAG,EAAU,CAAC;YAC7D,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAO,EAAE,EAAE,CAAC,CAAC,CAAC;YAC/B,eAAe,CAAC,GAAG,CAAC,KAAM,EAAE,GAAG,CAAC,CAAC;QACnC,CAAC;QACD,KAAK,MAAM,EAAE,IAAI,MAAM,CAAO,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;YAClD,MAAM,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;YACrC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAO,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;gBAC/C,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;gBACzC,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC,CAAC;gBAC9D,IAAI,CAAC,WAAW;oBAAE,SAAS;gBAC3B,MAAM,OAAO,GAAG,MAAM,CAAO,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBACxC,IAAI,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,QAAQ,CAAC;wBAAE,SAAS;oBACzE,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAE,EAAE,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,SAAS,GAAG,UAAU,CAAC;IACzB,CAAC;IAED,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5F,6EAA6E;IAC7E,6EAA6E;IAC7E,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkC,CAAC;IAC5D,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,MAAM,CAAO,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE;QACjE,MAAM,CAAO,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YAC5D,aAAa,EAAE,CAAC;YAChB,MAAM,CAAO,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE;gBACxD,cAAc,EAAE,CAAC;gBACjB,SAAS,CAAC,GAAG,CACX,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,WAAW,CAAC,EAClF;oBACE,KAAK,EAAE,YAAY,GAAG,CAAC;oBACvB,QAAQ,EAAE,UAAU,GAAG,CAAC;oBACxB,eAAe,EAAE,aAAa;oBAC9B,SAAS,EAAE,WAAW,GAAG,CAAC;oBAC1B,gBAAgB,EAAE,cAAc;iBACjC,CACF,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,MAAM,UAAU,GAAG;QACjB,MAAM;QACN,OAAO;QACP,UAAU;QACV,iBAAiB;QACjB,WAAW;QACX,kBAAkB;QAClB,WAAW;QACX,MAAM;QACN,SAAS;QACT,OAAO;QACP,SAAS;QACT,SAAS;KACV,CAAC;IACF,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC/B,MAAM,MAAM,GAAG,mBAAmB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;QACvE,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;IAC7D,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,gBAAgB,CAAC,eAAe,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;AAC/E,CAAC;AAED,+EAA+E"}
|
|
@@ -3,12 +3,12 @@ import { strOf, } from "../../domain/script/shared.js";
|
|
|
3
3
|
import { loadScriptForEdit, } from "./session.js";
|
|
4
4
|
import { buildTableReport, listAssetsByKind, } from "./lib.js";
|
|
5
5
|
import { parseV3QuerySelector } from "../../domain/script/v3/ordinal.js";
|
|
6
|
-
import {
|
|
6
|
+
import { requireStructurallyReadableScriptV4 } from "../../domain/script/v4/parse.js";
|
|
7
7
|
import { listAssetsV4 } from "./v4/queries.js";
|
|
8
8
|
export async function commandActors(opts) {
|
|
9
9
|
const session = await loadScriptForEdit(opts);
|
|
10
10
|
const result = session.version === 4
|
|
11
|
-
? listAssetsV4(
|
|
11
|
+
? listAssetsV4(requireStructurallyReadableScriptV4(session.script), "actor", {
|
|
12
12
|
id: strOf(opts["id"]).trim(),
|
|
13
13
|
name: strOf(opts["name"]).trim(),
|
|
14
14
|
in: opts["in"],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actors.js","sourceRoot":"","sources":["../../../src/usecases/script/actors.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,OAAO,GAWR,MAAM,iBAAiB,CAAC;AA4BzB,OAAO,EAKL,KAAK,GACN,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,iBAAiB,GAElB,MAAM,cAAc,CAAC;AACtB,OAAO,EAC6P,gBAAgB,EAAqI,gBAAgB,GACxa,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"actors.js","sourceRoot":"","sources":["../../../src/usecases/script/actors.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,OAAO,GAWR,MAAM,iBAAiB,CAAC;AA4BzB,OAAO,EAKL,KAAK,GACN,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,iBAAiB,GAElB,MAAM,cAAc,CAAC;AACtB,OAAO,EAC6P,gBAAgB,EAAqI,gBAAgB,GACxa,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,mCAAmC,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAU;IAC5C,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,KAAK,CAAC;QAClC,CAAC,CAAC,YAAY,CAAC,mCAAmC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE;YACzE,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;YAC5B,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE;YAChC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC;YACd,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAChC,CAAC;QACJ,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE;YACxC,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;YAC5B,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE;YAChC,QAAQ,EAAE,oBAAoB,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1D,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAChC,CAAC,CAAC;IACP,OAAO,CAAC,gBAAgB,CAAC,cAAc,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;AACnG,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { strOf, } from "../../domain/script/shared.js";
|
|
|
3
3
|
import { loadScriptForEdit, } from "./session.js";
|
|
4
4
|
import { buildTableReport, listAssetsByKind, } from "./lib.js";
|
|
5
5
|
import { parseV3QuerySelector } from "../../domain/script/v3/ordinal.js";
|
|
6
|
-
import {
|
|
6
|
+
import { requireStructurallyReadableScriptV4 } from "../../domain/script/v4/parse.js";
|
|
7
7
|
import { listAssetsV4 } from "./v4/queries.js";
|
|
8
8
|
export async function commandAssets(opts) {
|
|
9
9
|
const session = await loadScriptForEdit(opts);
|
|
@@ -15,7 +15,7 @@ export async function commandAssets(opts) {
|
|
|
15
15
|
const rows = [];
|
|
16
16
|
let rowColumns = [];
|
|
17
17
|
if (session.version === 4) {
|
|
18
|
-
const script =
|
|
18
|
+
const script = requireStructurallyReadableScriptV4(session.script);
|
|
19
19
|
for (const kind of ["actor", "location", "prop"]) {
|
|
20
20
|
if (kindFilter && kindFilter !== kind)
|
|
21
21
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/usecases/script/assets.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,OAAO,GAWR,MAAM,iBAAiB,CAAC;AA4BzB,OAAO,EAKL,KAAK,GACN,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,iBAAiB,GAElB,MAAM,cAAc,CAAC;AACtB,OAAO,EAC6P,gBAAgB,EAAqI,gBAAgB,GACxa,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/usecases/script/assets.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as fs from "node:fs";
|
|
2
|
-
import { CliError, EXIT_INPUT,
|
|
2
|
+
import { CliError, EXIT_INPUT, EXIT_OK, EXIT_USAGE, exists, readText, } from "../../common.js";
|
|
3
3
|
import { summarizeIssues } from "../../domain/script/text-util.js";
|
|
4
4
|
import { asList, strOf, } from "../../domain/script/shared.js";
|
|
5
|
-
import { loadScriptForEdit, validateSession, saveScriptSession, syncValidationResult, scriptSourceText, } from "./session.js";
|
|
5
|
+
import { loadScriptForEdit, validateSession, saveScriptSession, syncValidationResult, scriptSourceText, mutationValidationWarnings, } from "./session.js";
|
|
6
6
|
import { tokenizeLine, parseDoLine, doErr, lineToOp, applyPatchOperationsForSession, assertV4PlanHasExplicitNewIds, buildV4MutationPlan, } from "./lib.js";
|
|
7
7
|
export async function commandDo(opts) {
|
|
8
8
|
const file = strOf(asList(opts["_args"])[0]);
|
|
@@ -128,11 +128,9 @@ export async function commandDo(opts) {
|
|
|
128
128
|
? []
|
|
129
129
|
: summarizeIssues(asList(legacyValidation["issues"]));
|
|
130
130
|
const issues = plannedIssueLines ?? legacyIssueLines;
|
|
131
|
-
const hint =
|
|
132
|
-
? planDigest
|
|
133
|
-
|
|
134
|
-
: "Run `scriptctl do --apply` with the same input to commit."
|
|
135
|
-
: "Resolve validation issues before committing.";
|
|
131
|
+
const hint = planDigest
|
|
132
|
+
? `Run \`scriptctl do --apply --plan ${planDigest}\` with the same input to commit${passed ? "." : "; validation issues will remain available as follow-up diagnostics."}`
|
|
133
|
+
: `Run \`scriptctl do --apply\` with the same input to commit${passed ? "." : "; validation issues will remain available as follow-up diagnostics."}`;
|
|
136
134
|
const lines = [...head, `validation: ${passed ? "would pass" : "would need repair"}; no write`, ...issues, hint];
|
|
137
135
|
const report = {
|
|
138
136
|
text: lines.join("\n"),
|
|
@@ -152,15 +150,17 @@ export async function commandDo(opts) {
|
|
|
152
150
|
} : {}),
|
|
153
151
|
},
|
|
154
152
|
};
|
|
155
|
-
return [report,
|
|
153
|
+
return [report, EXIT_OK];
|
|
156
154
|
}
|
|
157
155
|
const [newRevision, idempotent] = await saveScriptSession(session, opts, "do");
|
|
158
156
|
const validation = validateSession(session);
|
|
159
157
|
await syncValidationResult(session, validation, newRevision);
|
|
160
158
|
const passed = Boolean(validation["passed"]);
|
|
159
|
+
const warnings = mutationValidationWarnings(session, validation);
|
|
161
160
|
const rev = session.remote ? `; rev ${newRevision}` : "";
|
|
162
161
|
const issues = summarizeIssues(asList(validation["issues"]));
|
|
163
|
-
const
|
|
162
|
+
const warningLines = summarizeIssues(warnings);
|
|
163
|
+
const lines = [...head, `validation: ${passed ? "passed" : "needs repair"}${rev}`, ...warningLines];
|
|
164
164
|
const report = {
|
|
165
165
|
text: lines.join("\n"),
|
|
166
166
|
data: {
|
|
@@ -168,7 +168,9 @@ export async function commandDo(opts) {
|
|
|
168
168
|
changed: applied.length > 0,
|
|
169
169
|
revision: session.remote ? newRevision : undefined,
|
|
170
170
|
idempotent: session.remote ? idempotent : undefined,
|
|
171
|
+
validation,
|
|
171
172
|
issues,
|
|
173
|
+
warnings,
|
|
172
174
|
script_path: session.artifactLabel,
|
|
173
175
|
...(planDigest ? {
|
|
174
176
|
baseline: session.baselineHash,
|
|
@@ -179,6 +181,6 @@ export async function commandDo(opts) {
|
|
|
179
181
|
} : {}),
|
|
180
182
|
},
|
|
181
183
|
};
|
|
182
|
-
return [report,
|
|
184
|
+
return [report, EXIT_OK];
|
|
183
185
|
}
|
|
184
186
|
//# sourceMappingURL=do.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"do.js","sourceRoot":"","sources":["../../../src/usecases/script/do.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAK9B,OAAO,EACL,QAAQ,EACR,UAAU,EACV,
|
|
1
|
+
{"version":3,"file":"do.js","sourceRoot":"","sources":["../../../src/usecases/script/do.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { asList, strOf, } from "../../domain/script/shared.js";
|
|
|
4
4
|
import { loadScriptForEdit, parseBound, episodeCharCounts, } from "./session.js";
|
|
5
5
|
import { buildTableReport, synopsisPreview, episodeInSelector, } from "./lib.js";
|
|
6
6
|
import { normalizeV3QuerySelector } from "../../domain/script/v3/ordinal.js";
|
|
7
|
-
import {
|
|
7
|
+
import { requireStructurallyReadableScriptV4 } from "../../domain/script/v4/parse.js";
|
|
8
8
|
import { parseV4Selector } from "../../domain/script/v4/selector.js";
|
|
9
9
|
export async function commandEpisodes(opts) {
|
|
10
10
|
const session = await loadScriptForEdit(opts);
|
|
@@ -14,7 +14,7 @@ export async function commandEpisodes(opts) {
|
|
|
14
14
|
? parseInSelector(normalizeV3QuerySelector(script, opts["in"]))
|
|
15
15
|
: null;
|
|
16
16
|
const selectorV4 = session.version === 4
|
|
17
|
-
? parseV4Selector(
|
|
17
|
+
? parseV4Selector(requireStructurallyReadableScriptV4(script), opts["in"], { allowOrdinals: true })
|
|
18
18
|
: null;
|
|
19
19
|
const minChars = parseBound(opts["min_chars"]);
|
|
20
20
|
const maxChars = parseBound(opts["max_chars"]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"episodes.js","sourceRoot":"","sources":["../../../src/usecases/script/episodes.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,OAAO,GAWR,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAIL,eAAe,GAGhB,MAAM,iCAAiC,CAAC;AAkBzC,OAAO,EACL,MAAM,EAIN,KAAK,GACN,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,iBAAiB,EAC6B,UAAU,EAAE,iBAAiB,GAC5E,MAAM,cAAc,CAAC;AACtB,OAAO,EAC6P,gBAAgB,EAAE,eAAe,EAAE,iBAAiB,GACvT,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"episodes.js","sourceRoot":"","sources":["../../../src/usecases/script/episodes.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@ import { CliError, EXIT_INPUT, EXIT_OK, EXIT_USAGE, scriptJsonPath, } from "../.
|
|
|
4
4
|
import { GENERATED_SOURCE, scriptExportDocument, targetExportDocument, } from "../../domain/authoring/v3/export.js";
|
|
5
5
|
import { serializeAuthoring } from "../../domain/authoring/v3/serializer.js";
|
|
6
6
|
import { requireScriptV3 } from "../../domain/script/v3/parse.js";
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
7
|
+
import { requireStructurallyReadableScriptDocument, } from "../../domain/script/dispatch.js";
|
|
8
|
+
import { requireStructurallyReadableScriptV4 } from "../../domain/script/v4/parse.js";
|
|
9
9
|
import { serializeAuthoringV4 } from "../../domain/authoring/v4/serializer.js";
|
|
10
10
|
import { strOf } from "../../domain/script/shared.js";
|
|
11
11
|
import { atomicWriteText } from "../../infra/script-working-copy.js";
|
|
@@ -29,7 +29,7 @@ function readScript(opts) {
|
|
|
29
29
|
error instanceof Error ? error.message : String(error),
|
|
30
30
|
], "Provide a readable local Script v3 file.");
|
|
31
31
|
}
|
|
32
|
-
return
|
|
32
|
+
return requireStructurallyReadableScriptDocument(value);
|
|
33
33
|
}
|
|
34
34
|
function regions(raw) {
|
|
35
35
|
if (!raw)
|
|
@@ -275,7 +275,7 @@ export function commandExportAuthoring(kind, opts) {
|
|
|
275
275
|
const selector = strOf(opts["in"]).trim();
|
|
276
276
|
const outputPath = path.resolve(outputRaw);
|
|
277
277
|
if (script.version === 4) {
|
|
278
|
-
const exported = serializeAuthoringV4(
|
|
278
|
+
const exported = serializeAuthoringV4(requireStructurallyReadableScriptV4(script), kind, selector);
|
|
279
279
|
atomicWriteText(outputPath, exported.content);
|
|
280
280
|
return [{
|
|
281
281
|
text: `Exported ${exported.targetCount} ${kind} target(s) to ${outputPath}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export-authoring.js","sourceRoot":"","sources":["../../../src/usecases/script/export-authoring.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"export-authoring.js","sourceRoot":"","sources":["../../../src/usecases/script/export-authoring.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { parseAnyAddress } from "../../domain/script/address.js";
|
|
|
3
3
|
import { readExtend } from "../../domain/script/patch/ops-extend.js";
|
|
4
4
|
import { parseV4Address } from "../../domain/script/v4/address.js";
|
|
5
5
|
import { readExtendV4 } from "../../domain/script/v4/patch/ops-extend.js";
|
|
6
|
-
import {
|
|
6
|
+
import { requireStructurallyReadableScriptV4 } from "../../domain/script/v4/parse.js";
|
|
7
7
|
import { asList } from "../../domain/script/shared.js";
|
|
8
8
|
import { loadScriptForEdit } from "./session.js";
|
|
9
9
|
import { applySingleScriptOpToSession } from "./lib.js";
|
|
@@ -35,7 +35,7 @@ export async function commandExtend(opts) {
|
|
|
35
35
|
// Read mode: address only, no key, not a wipe.
|
|
36
36
|
if (args.length < 2 && !clear) {
|
|
37
37
|
const ext = session.version === 4
|
|
38
|
-
? readExtendV4(
|
|
38
|
+
? readExtendV4(requireStructurallyReadableScriptV4(session.script), args[0])
|
|
39
39
|
: readExtend(session.script, parseAnyAddress(args[0]));
|
|
40
40
|
const lines = [];
|
|
41
41
|
for (const k of Object.keys(ext))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extend.js","sourceRoot":"","sources":["../../../src/usecases/script/extend.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,OAAO,EACP,UAAU,GAEX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"extend.js","sourceRoot":"","sources":["../../../src/usecases/script/extend.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as fs from "node:fs";
|
|
2
2
|
import { CliError, EXIT_INPUT, EXIT_OK, EXIT_USAGE, exists, scriptJsonPath, } from "../../common.js";
|
|
3
|
-
import {
|
|
3
|
+
import { requireStructurallyReadableScriptDocument, } from "../../domain/script/dispatch.js";
|
|
4
4
|
import { generateV4Ids } from "../../domain/script/v4/ids.js";
|
|
5
5
|
import { strOf } from "../../domain/script/shared.js";
|
|
6
6
|
const PREFIX = {
|
|
@@ -48,7 +48,7 @@ function readScript(opts) {
|
|
|
48
48
|
data: { actual: [scriptPath, error instanceof Error ? error.message : String(error)] },
|
|
49
49
|
});
|
|
50
50
|
}
|
|
51
|
-
return
|
|
51
|
+
return requireStructurallyReadableScriptDocument(parsed);
|
|
52
52
|
}
|
|
53
53
|
function existingIdsV3(script, kind) {
|
|
54
54
|
if (kind === "actor")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ids.js","sourceRoot":"","sources":["../../../src/usecases/script/ids.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9B,OAAO,EACL,QAAQ,EACR,UAAU,EACV,OAAO,EACP,UAAU,EACV,MAAM,EACN,cAAc,GAEf,MAAM,iBAAiB,CAAC;AACzB,OAAO,
|
|
1
|
+
{"version":3,"file":"ids.js","sourceRoot":"","sources":["../../../src/usecases/script/ids.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CliError, EXIT_INPUT,
|
|
1
|
+
import { CliError, EXIT_INPUT, EXIT_OK, EXIT_USAGE, sha256Text, } from "../../common.js";
|
|
2
2
|
import { applyPatchOperationsV4 } from "../../domain/script/v4/patch/apply.js";
|
|
3
3
|
import { isV4Id } from "../../domain/script/v4/ids.js";
|
|
4
4
|
import { requireStructurallyReadableScriptV4 } from "../../domain/script/v4/parse.js";
|
|
@@ -10,7 +10,7 @@ import { parseV4Address } from "../../domain/script/v4/address.js";
|
|
|
10
10
|
import { summarizeIssues } from "../../domain/script/text-util.js";
|
|
11
11
|
import { sortDeep } from "../../domain/script/text-util.js";
|
|
12
12
|
import { asList, idNum, isDict, strOf, } from "../../domain/script/shared.js";
|
|
13
|
-
import { loadScriptForEdit, validateSession, saveScriptSession, syncValidationResult, scriptSourceText, } from "./session.js";
|
|
13
|
+
import { loadScriptForEdit, validateSession, saveScriptSession, syncValidationResult, scriptSourceText, mutationValidationWarnings, } from "./session.js";
|
|
14
14
|
import { resolveActionTargetsV4 } from "./v4/queries.js";
|
|
15
15
|
import { actionTimestampFilter, actionTimestampMatches } from "./timestamp-filter.js";
|
|
16
16
|
import { applyVersionedMutations } from "./dispatch.js";
|
|
@@ -1006,12 +1006,14 @@ export async function applyScriptOpsToSession(session, opts, operations) {
|
|
|
1006
1006
|
const validation = validateSession(session);
|
|
1007
1007
|
await syncValidationResult(session, validation, newRevision);
|
|
1008
1008
|
const passed = Boolean(validation["passed"]);
|
|
1009
|
+
const warnings = mutationValidationWarnings(session, validation);
|
|
1009
1010
|
// One outcome line: what changed + revision (remote) + validation verdict.
|
|
1010
1011
|
const rev = session.remote ? `; rev ${newRevision}` : "";
|
|
1011
1012
|
const resultLine = `${applied.join(", ")} applied${rev}; validation ${passed ? "passed" : "needs repair"}`;
|
|
1012
1013
|
const issues = summarizeIssues(asList(validation["issues"]));
|
|
1014
|
+
const warningLines = summarizeIssues(warnings);
|
|
1013
1015
|
const report = {
|
|
1014
|
-
text: [resultLine, ...
|
|
1016
|
+
text: [resultLine, ...warningLines].join("\n"),
|
|
1015
1017
|
data: {
|
|
1016
1018
|
op: opName,
|
|
1017
1019
|
changed: applied.length > 0,
|
|
@@ -1019,10 +1021,11 @@ export async function applyScriptOpsToSession(session, opts, operations) {
|
|
|
1019
1021
|
idempotent: session.remote ? idempotent : undefined,
|
|
1020
1022
|
validation,
|
|
1021
1023
|
issues,
|
|
1024
|
+
warnings,
|
|
1022
1025
|
script_path: session.artifactLabel,
|
|
1023
1026
|
},
|
|
1024
1027
|
};
|
|
1025
|
-
return [report,
|
|
1028
|
+
return [report, EXIT_OK];
|
|
1026
1029
|
}
|
|
1027
1030
|
export async function applySingleScriptOp(opts, op) {
|
|
1028
1031
|
const session = await loadScriptForEdit(opts);
|
|
@@ -1166,8 +1169,8 @@ export async function applySelectorEditsToSession(session, opts, template, verbL
|
|
|
1166
1169
|
const hint = refs.length === 0
|
|
1167
1170
|
? "Widen the selection with --in, --grep, or predicates."
|
|
1168
1171
|
: planDigest
|
|
1169
|
-
? `Run again with --apply --plan ${planDigest} to commit this exact plan
|
|
1170
|
-
:
|
|
1172
|
+
? `Run again with --apply --plan ${planDigest} to commit this exact plan${passed ? "." : "; validation issues will remain available as follow-up diagnostics."}`
|
|
1173
|
+
: `Run again with --apply to commit${passed ? "." : "; validation issues will remain available as follow-up diagnostics."}`;
|
|
1171
1174
|
const lines = [...blast, `validation: ${passed ? "would pass" : "would need repair"}; no write`, ...issues, hint];
|
|
1172
1175
|
const report = {
|
|
1173
1176
|
text: lines.join("\n"),
|
|
@@ -1188,7 +1191,7 @@ export async function applySelectorEditsToSession(session, opts, template, verbL
|
|
|
1188
1191
|
} : {}),
|
|
1189
1192
|
},
|
|
1190
1193
|
};
|
|
1191
|
-
return [report,
|
|
1194
|
+
return [report, EXIT_OK];
|
|
1192
1195
|
}
|
|
1193
1196
|
if (refs.length === 0) {
|
|
1194
1197
|
return [{
|
|
@@ -1205,10 +1208,12 @@ export async function applySelectorEditsToSession(session, opts, template, verbL
|
|
|
1205
1208
|
const validation = validateSession(session);
|
|
1206
1209
|
await syncValidationResult(session, validation, newRevision);
|
|
1207
1210
|
const passed = Boolean(validation["passed"]);
|
|
1211
|
+
const warnings = mutationValidationWarnings(session, validation);
|
|
1208
1212
|
const rev = session.remote ? `; rev ${newRevision}` : "";
|
|
1209
1213
|
const issues = summarizeIssues(asList(validation["issues"]));
|
|
1214
|
+
const warningLines = summarizeIssues(warnings);
|
|
1210
1215
|
const report = {
|
|
1211
|
-
text: [...blast, `validation: ${passed ? "passed" : "needs repair"}${rev}`, ...
|
|
1216
|
+
text: [...blast, `validation: ${passed ? "passed" : "needs repair"}${rev}`, ...warningLines].join("\n"),
|
|
1212
1217
|
data: {
|
|
1213
1218
|
op: opName,
|
|
1214
1219
|
changed: applied > 0,
|
|
@@ -1219,6 +1224,7 @@ export async function applySelectorEditsToSession(session, opts, template, verbL
|
|
|
1219
1224
|
idempotent: session.remote ? idempotent : undefined,
|
|
1220
1225
|
validation,
|
|
1221
1226
|
issues,
|
|
1227
|
+
warnings,
|
|
1222
1228
|
script_path: session.artifactLabel,
|
|
1223
1229
|
...(planDigest ? {
|
|
1224
1230
|
baseline: session.baselineHash,
|
|
@@ -1229,7 +1235,7 @@ export async function applySelectorEditsToSession(session, opts, template, verbL
|
|
|
1229
1235
|
} : {}),
|
|
1230
1236
|
},
|
|
1231
1237
|
};
|
|
1232
|
-
return [report,
|
|
1238
|
+
return [report, EXIT_OK];
|
|
1233
1239
|
}
|
|
1234
1240
|
export async function applySelectorEdits(opts, template, verbLabel) {
|
|
1235
1241
|
const session = await loadScriptForEdit(opts);
|