@orkestrel/scaffold 0.0.112 → 0.0.113

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.
@@ -231,7 +231,7 @@ export class TokenScanner {
231
231
  previous.prefix === true ||
232
232
  (previous.category === 'code' &&
233
233
  (REGEX_PREFIX.test(spelling) ||
234
- !/^(?:[\p{ID_Continue}$]+|[\])}]|\+\+|--)$/u.test(spelling))));
234
+ !/^(?:[\p{ID_Continue}$]+|\d[\w.]*|[\])}]|\+\+|--)$/u.test(spelling))));
235
235
  const category = rest.startsWith('//')
236
236
  ? 'line'
237
237
  : rest.startsWith('/*')
@@ -247,8 +247,8 @@ export class TokenScanner {
247
247
  ? /^\/\*[\s\S]*?\*\//u.exec(rest)
248
248
  : category === 'string'
249
249
  ? (character === "'"
250
- ? /^'(?:\\(?:\r\n|[\s\S])|[^'\\\r\n\u2028\u2029])*'/u
251
- : /^"(?:\\(?:\r\n|[\s\S])|[^"\\\r\n\u2028\u2029])*"/u).exec(rest)
250
+ ? /^'(?:\\(?:\r\n|[\s\S])|[^'\\\r\n])*'/u
251
+ : /^"(?:\\(?:\r\n|[\s\S])|[^"\\\r\n])*"/u).exec(rest)
252
252
  : category === 'regex'
253
253
  ? /^\/(?:\\[^\r\n]|\[(?:\\[^\r\n]|[^\]\\\r\n])*\]|[^/\\[\r\n])*\/[a-z]*/iu.exec(rest)
254
254
  : /^(?:[\p{ID_Start}_$][\p{ID_Continue}$]*|\d[\w.]*|\s+|\+\+|--|=>|.)/u.exec(rest);
@@ -1005,11 +1005,39 @@ export function runRecord(runner, name) {
1005
1005
  ? { exit: 1, note: `tree remains dirty: ${result.stdout}` }
1006
1006
  : readVerdict(result));
1007
1007
  }
1008
+ /**
1009
+ * Moves one declared range to the registry caret of a release, keeping every other major a
1010
+ * disjunctive range admits.
1011
+ *
1012
+ * @remarks
1013
+ * A range of one comparator set becomes the caret. A range joined by `||` names one supported major
1014
+ * per arm, so only the arm in the release's major becomes the caret; a range with no arm in that
1015
+ * major stays as declared, which keeps the wave inside each declared major.
1016
+ *
1017
+ * @param current - The declared range.
1018
+ * @param latest - The release's version.
1019
+ * @returns The moved range.
1020
+ * @example
1021
+ * ```ts
1022
+ * moveRange('^4.1.11 || ^5.0.4', '5.0.5') // '^4.1.11 || ^5.0.5'
1023
+ * ```
1024
+ */
1025
+ export function moveRange(current, latest) {
1026
+ const caret = `^${latest}`;
1027
+ if (typeof current !== 'string' || !current.includes('||'))
1028
+ return caret;
1029
+ const major = /^(\d+)\./u.exec(latest)?.[1];
1030
+ return current
1031
+ .split(/\s*\|\|\s*/u)
1032
+ .map((arm) => (/^[\^~=v\s]*(\d+)/u.exec(arm)?.[1] === major ? caret : arm))
1033
+ .join(' || ');
1034
+ }
1008
1035
  /**
1009
1036
  * Moves each named dependency to the registry caret of its latest release.
1010
1037
  *
1011
1038
  * @remarks
1012
- * A later release of the same name reads the range the earlier reading wrote.
1039
+ * A later release of the same name reads the range the earlier reading wrote. A disjunctive range
1040
+ * moves only its arm in the release's major, per {@link moveRange}.
1013
1041
  *
1014
1042
  * @param ranges - The block's ranges by name.
1015
1043
  * @param releases - The audit's release readings.
@@ -1019,12 +1047,16 @@ export function computeRanges(ranges, releases) {
1019
1047
  return releases.reduce((state, release) => {
1020
1048
  if (release.latest === undefined || !(release.name in state.ranges))
1021
1049
  return state;
1022
- const caret = `^${release.latest}`;
1023
- return state.ranges[release.name] === caret
1050
+ const current = state.ranges[release.name];
1051
+ const next = moveRange(current, release.latest);
1052
+ return current === next
1024
1053
  ? state
1025
1054
  : {
1026
- ranges: { ...state.ranges, [release.name]: caret },
1027
- moved: [...state.moved, `${release.name} ${String(release.range)} -> ${caret}`],
1055
+ ranges: { ...state.ranges, [release.name]: next },
1056
+ moved: [
1057
+ ...state.moved,
1058
+ `${release.name} ${typeof current === 'string' ? current : String(release.range)} -> ${String(next)}`,
1059
+ ],
1028
1060
  };
1029
1061
  }, { ranges, moved: [] });
1030
1062
  }
package/dist/bin/main.js CHANGED
@@ -10,7 +10,7 @@ import { normalize } from "node:path";
10
10
  import { parseArgs } from "node:util";
11
11
  var package_default = {
12
12
  name: "@orkestrel/scaffold",
13
- version: "0.0.112",
13
+ version: "0.0.113",
14
14
  description: "Scaffold workspaces with commands: new, audit, repair, catalog, and overwrite.",
15
15
  keywords: [
16
16
  "audit",