@memoarchitect/tools 0.16.0 → 0.16.2
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/README.md +2 -2
- package/corpus/README.md +3 -2
- package/corpus/sysml-v2-release/sysml.library/Domain Libraries/Quantities and Units/SI.sysml +378 -0
- package/corpus/sysml-v2-release/sysml.library/Domain Libraries/Quantities and Units/SIPrefixes.sysml +48 -0
- package/package.json +5 -2
- package/packages/tools/lib/authoring/outline-source.d.ts +11 -0
- package/packages/tools/lib/authoring/outline-source.d.ts.map +1 -1
- package/packages/tools/lib/authoring/outline-source.js +15 -1
- package/packages/tools/lib/authoring/outline-source.js.map +1 -1
- package/packages/tools/lib/bin/memo.js +6 -40
- package/packages/tools/lib/bin/memo.js.map +1 -1
- package/packages/tools/lib/browser/index.d.ts +5 -0
- package/packages/tools/lib/browser/index.d.ts.map +1 -1
- package/packages/tools/lib/browser/index.js +5 -0
- package/packages/tools/lib/browser/index.js.map +1 -1
- package/packages/tools/lib/cli/project-commands.d.ts +7 -1
- package/packages/tools/lib/cli/project-commands.d.ts.map +1 -1
- package/packages/tools/lib/cli/project-commands.js +35 -17
- package/packages/tools/lib/cli/project-commands.js.map +1 -1
- package/packages/tools/lib/commands/dev.d.ts.map +1 -1
- package/packages/tools/lib/commands/dev.js +7 -48
- package/packages/tools/lib/commands/dev.js.map +1 -1
- package/packages/tools/lib/commands/dhf-draft.js +1 -1
- package/packages/tools/lib/commands/dhf-draft.js.map +1 -1
- package/packages/tools/lib/commands/dhf-lint.d.ts.map +1 -1
- package/packages/tools/lib/commands/dhf-lint.js +9 -0
- package/packages/tools/lib/commands/dhf-lint.js.map +1 -1
- package/packages/tools/lib/commands/dhf.d.ts +7 -1
- package/packages/tools/lib/commands/dhf.d.ts.map +1 -1
- package/packages/tools/lib/commands/dhf.js +16 -7
- package/packages/tools/lib/commands/dhf.js.map +1 -1
- package/packages/tools/lib/commands/init.d.ts +0 -10
- package/packages/tools/lib/commands/init.d.ts.map +1 -1
- package/packages/tools/lib/commands/init.js +3 -105
- package/packages/tools/lib/commands/init.js.map +1 -1
- package/packages/tools/lib/commands/standards.d.ts.map +1 -1
- package/packages/tools/lib/commands/standards.js +3 -9
- package/packages/tools/lib/commands/standards.js.map +1 -1
- package/packages/tools/lib/commands/toolchain.d.ts +2 -0
- package/packages/tools/lib/commands/toolchain.d.ts.map +1 -1
- package/packages/tools/lib/commands/toolchain.js +25 -1
- package/packages/tools/lib/commands/toolchain.js.map +1 -1
- package/packages/tools/lib/commands/upgrade.d.ts +19 -0
- package/packages/tools/lib/commands/upgrade.d.ts.map +1 -0
- package/packages/tools/lib/commands/upgrade.js +108 -0
- package/packages/tools/lib/commands/upgrade.js.map +1 -0
- package/packages/tools/lib/commands/validate.d.ts.map +1 -1
- package/packages/tools/lib/commands/validate.js +1 -14
- package/packages/tools/lib/commands/validate.js.map +1 -1
- package/packages/tools/lib/dhf/device-dhf.d.ts +23 -0
- package/packages/tools/lib/dhf/device-dhf.d.ts.map +1 -1
- package/packages/tools/lib/dhf/device-dhf.js +66 -19
- package/packages/tools/lib/dhf/device-dhf.js.map +1 -1
- package/packages/tools/lib/dhf/diagram-images.d.ts +50 -0
- package/packages/tools/lib/dhf/diagram-images.d.ts.map +1 -0
- package/packages/tools/lib/dhf/diagram-images.js +72 -0
- package/packages/tools/lib/dhf/diagram-images.js.map +1 -0
- package/packages/tools/lib/dhf/document-compiler.d.ts +6 -0
- package/packages/tools/lib/dhf/document-compiler.d.ts.map +1 -1
- package/packages/tools/lib/dhf/document-compiler.js +18 -1
- package/packages/tools/lib/dhf/document-compiler.js.map +1 -1
- package/packages/tools/lib/dhf/document-ir.d.ts +14 -1
- package/packages/tools/lib/dhf/document-ir.d.ts.map +1 -1
- package/packages/tools/lib/dhf/document-ir.js.map +1 -1
- package/packages/tools/lib/dhf/document-registry.d.ts.map +1 -1
- package/packages/tools/lib/dhf/document-registry.js +8 -4
- package/packages/tools/lib/dhf/document-registry.js.map +1 -1
- package/packages/tools/lib/dhf/exporters/docx-document.d.ts +18 -0
- package/packages/tools/lib/dhf/exporters/docx-document.d.ts.map +1 -0
- package/packages/tools/lib/dhf/exporters/docx-document.js +175 -0
- package/packages/tools/lib/dhf/exporters/docx-document.js.map +1 -0
- package/packages/tools/lib/dhf/exporters/docx-exporter.d.ts +0 -6
- package/packages/tools/lib/dhf/exporters/docx-exporter.d.ts.map +1 -1
- package/packages/tools/lib/dhf/exporters/docx-exporter.js +6 -145
- package/packages/tools/lib/dhf/exporters/docx-exporter.js.map +1 -1
- package/packages/tools/lib/dhf/exporters/html-exporter.js +4 -0
- package/packages/tools/lib/dhf/exporters/html-exporter.js.map +1 -1
- package/packages/tools/lib/dhf/exporters/markdown-exporter.js +1 -0
- package/packages/tools/lib/dhf/exporters/markdown-exporter.js.map +1 -1
- package/packages/tools/lib/dhf/index.d.ts +1 -0
- package/packages/tools/lib/dhf/index.d.ts.map +1 -1
- package/packages/tools/lib/dhf/index.js +1 -0
- package/packages/tools/lib/dhf/index.js.map +1 -1
- package/packages/tools/lib/dhf/markdown-to-ir.d.ts.map +1 -1
- package/packages/tools/lib/dhf/markdown-to-ir.js +8 -0
- package/packages/tools/lib/dhf/markdown-to-ir.js.map +1 -1
- package/packages/tools/lib/dhf/query-executor.d.ts.map +1 -1
- package/packages/tools/lib/dhf/query-executor.js +44 -5
- package/packages/tools/lib/dhf/query-executor.js.map +1 -1
- package/packages/tools/lib/dhf/standards-library.d.ts.map +1 -1
- package/packages/tools/lib/dhf/standards-library.js +16 -13
- package/packages/tools/lib/dhf/standards-library.js.map +1 -1
- package/packages/tools/lib/dhf/standards-report.d.ts +2 -4
- package/packages/tools/lib/dhf/standards-report.d.ts.map +1 -1
- package/packages/tools/lib/dhf/standards-report.js +2 -7
- package/packages/tools/lib/dhf/standards-report.js.map +1 -1
- package/packages/tools/lib/dhf/template-resolver.d.ts.map +1 -1
- package/packages/tools/lib/dhf/template-resolver.js +10 -8
- package/packages/tools/lib/dhf/template-resolver.js.map +1 -1
- package/packages/tools/lib/index.d.ts +1 -1
- package/packages/tools/lib/index.d.ts.map +1 -1
- package/packages/tools/lib/index.js.map +1 -1
- package/packages/tools/lib/lock.d.ts +1 -1
- package/packages/tools/lib/lock.js +1 -1
- package/packages/tools/lib/mcp/model-loader.js +1 -1
- package/packages/tools/lib/mcp/model-loader.js.map +1 -1
- package/packages/tools/lib/methodology/guide-service.js +1 -1
- package/packages/tools/lib/methodology/guide-service.js.map +1 -1
- package/packages/tools/lib/model/complete-model.d.ts.map +1 -1
- package/packages/tools/lib/model/complete-model.js +7 -1
- package/packages/tools/lib/model/complete-model.js.map +1 -1
- package/packages/tools/lib/model/config-loader.js +6 -6
- package/packages/tools/lib/model/config-loader.js.map +1 -1
- package/packages/tools/lib/model/effective-scope.d.ts.map +1 -1
- package/packages/tools/lib/model/effective-scope.js +6 -1
- package/packages/tools/lib/model/effective-scope.js.map +1 -1
- package/packages/tools/lib/model/kind-registry.d.ts +2 -0
- package/packages/tools/lib/model/kind-registry.d.ts.map +1 -1
- package/packages/tools/lib/model/kind-registry.js +4 -2
- package/packages/tools/lib/model/kind-registry.js.map +1 -1
- package/packages/tools/lib/model/native-project.d.ts.map +1 -1
- package/packages/tools/lib/model/native-project.js +7 -16
- package/packages/tools/lib/model/native-project.js.map +1 -1
- package/packages/tools/lib/model/paths.d.ts +9 -1
- package/packages/tools/lib/model/paths.d.ts.map +1 -1
- package/packages/tools/lib/model/paths.js +18 -1
- package/packages/tools/lib/model/paths.js.map +1 -1
- package/packages/tools/lib/model/pinned.d.ts +19 -0
- package/packages/tools/lib/model/pinned.d.ts.map +1 -1
- package/packages/tools/lib/model/pinned.js +87 -9
- package/packages/tools/lib/model/pinned.js.map +1 -1
- package/packages/tools/lib/model/project-conversion.d.ts +12 -3
- package/packages/tools/lib/model/project-conversion.d.ts.map +1 -1
- package/packages/tools/lib/model/project-conversion.js +71 -20
- package/packages/tools/lib/model/project-conversion.js.map +1 -1
- package/packages/tools/lib/model/quantity-core.d.ts +54 -0
- package/packages/tools/lib/model/quantity-core.d.ts.map +1 -0
- package/packages/tools/lib/model/quantity-core.js +298 -0
- package/packages/tools/lib/model/quantity-core.js.map +1 -0
- package/packages/tools/lib/model/quantity-format.d.ts +14 -0
- package/packages/tools/lib/model/quantity-format.d.ts.map +1 -0
- package/packages/tools/lib/model/quantity-format.js +31 -0
- package/packages/tools/lib/model/quantity-format.js.map +1 -0
- package/packages/tools/lib/model/quantity.d.ts +12 -0
- package/packages/tools/lib/model/quantity.d.ts.map +1 -0
- package/packages/tools/lib/model/quantity.js +49 -0
- package/packages/tools/lib/model/quantity.js.map +1 -0
- package/packages/tools/lib/model/relationship-legality.d.ts +34 -0
- package/packages/tools/lib/model/relationship-legality.d.ts.map +1 -1
- package/packages/tools/lib/model/relationship-legality.js +16 -10
- package/packages/tools/lib/model/relationship-legality.js.map +1 -1
- package/packages/tools/lib/model/relationship-registry.d.ts +11 -1
- package/packages/tools/lib/model/relationship-registry.d.ts.map +1 -1
- package/packages/tools/lib/model/relationship-registry.js +20 -1
- package/packages/tools/lib/model/relationship-registry.js.map +1 -1
- package/packages/tools/lib/model/semantic.d.ts +7 -1
- package/packages/tools/lib/model/semantic.d.ts.map +1 -1
- package/packages/tools/lib/model/semantic.js +4 -0
- package/packages/tools/lib/model/semantic.js.map +1 -1
- package/packages/tools/lib/model/user-settings.d.ts +2 -0
- package/packages/tools/lib/model/user-settings.d.ts.map +1 -1
- package/packages/tools/lib/model/user-settings.js +6 -2
- package/packages/tools/lib/model/user-settings.js.map +1 -1
- package/packages/tools/lib/model/view-deriver.js +1 -1
- package/packages/tools/lib/model/view-deriver.js.map +1 -1
- package/packages/tools/lib/operations/ai-authoring.js +1 -1
- package/packages/tools/lib/operations/ai-authoring.js.map +1 -1
- package/packages/tools/lib/operations/index.d.ts +2 -1
- package/packages/tools/lib/operations/index.d.ts.map +1 -1
- package/packages/tools/lib/operations/index.js +2 -1
- package/packages/tools/lib/operations/index.js.map +1 -1
- package/packages/tools/lib/operations/project-snapshot.d.ts +9 -1
- package/packages/tools/lib/operations/project-snapshot.d.ts.map +1 -1
- package/packages/tools/lib/operations/project-snapshot.js +12 -13
- package/packages/tools/lib/operations/project-snapshot.js.map +1 -1
- package/packages/tools/lib/pin-check.d.ts +33 -0
- package/packages/tools/lib/pin-check.d.ts.map +1 -0
- package/packages/tools/lib/pin-check.js +144 -0
- package/packages/tools/lib/pin-check.js.map +1 -0
- package/packages/tools/lib/serializer/sysml-generator.d.ts.map +1 -1
- package/packages/tools/lib/serializer/sysml-generator.js +7 -1
- package/packages/tools/lib/serializer/sysml-generator.js.map +1 -1
- package/packages/tools/lib/server/dev-server.d.ts +0 -6
- package/packages/tools/lib/server/dev-server.d.ts.map +1 -1
- package/packages/tools/lib/server/dev-server.js +14 -23
- package/packages/tools/lib/server/dev-server.js.map +1 -1
- package/packages/tools/lib/server/persistor.d.ts +16 -8
- package/packages/tools/lib/server/persistor.d.ts.map +1 -1
- package/packages/tools/lib/server/persistor.js +76 -23
- package/packages/tools/lib/server/persistor.js.map +1 -1
- package/packages/tools/lib/server/relationship-writer.d.ts.map +1 -1
- package/packages/tools/lib/server/relationship-writer.js +48 -12
- package/packages/tools/lib/server/relationship-writer.js.map +1 -1
- package/packages/tools/lib/server/runtime-budget.d.ts +12 -3
- package/packages/tools/lib/server/runtime-budget.d.ts.map +1 -1
- package/packages/tools/lib/server/runtime-budget.js +12 -3
- package/packages/tools/lib/server/runtime-budget.js.map +1 -1
- package/packages/tools/lib/server/sysml-notation.d.ts +7 -5
- package/packages/tools/lib/server/sysml-notation.d.ts.map +1 -1
- package/packages/tools/lib/server/sysml-notation.js +25 -6
- package/packages/tools/lib/server/sysml-notation.js.map +1 -1
- package/packages/tools/lib/server/view-layout-store.d.ts +9 -0
- package/packages/tools/lib/server/view-layout-store.d.ts.map +1 -1
- package/packages/tools/lib/server/view-layout-store.js +12 -0
- package/packages/tools/lib/server/view-layout-store.js.map +1 -1
- package/packages/tools/lib/server/view-writer.d.ts.map +1 -1
- package/packages/tools/lib/server/view-writer.js +5 -2
- package/packages/tools/lib/server/view-writer.js.map +1 -1
- package/packages/tools/lib/stage2/api-model.d.ts +10 -0
- package/packages/tools/lib/stage2/api-model.d.ts.map +1 -1
- package/packages/tools/lib/stage2/api-model.js +35 -0
- package/packages/tools/lib/stage2/api-model.js.map +1 -1
- package/packages/tools/lib/stage2/build-from-api.d.ts.map +1 -1
- package/packages/tools/lib/stage2/build-from-api.js +119 -5
- package/packages/tools/lib/stage2/build-from-api.js.map +1 -1
- package/packages/tools/lib/stage2/package-metadata-from-api.d.ts +5 -0
- package/packages/tools/lib/stage2/package-metadata-from-api.d.ts.map +1 -1
- package/packages/tools/lib/stage2/package-metadata-from-api.js +8 -1
- package/packages/tools/lib/stage2/package-metadata-from-api.js.map +1 -1
- package/packages/tools/lib/stage2/registries-from-api.d.ts +9 -1
- package/packages/tools/lib/stage2/registries-from-api.d.ts.map +1 -1
- package/packages/tools/lib/stage2/registries-from-api.js +27 -2
- package/packages/tools/lib/stage2/registries-from-api.js.map +1 -1
- package/packages/tools/lib/toolchain/effective.d.ts +7 -6
- package/packages/tools/lib/toolchain/effective.d.ts.map +1 -1
- package/packages/tools/lib/toolchain/effective.js +13 -4
- package/packages/tools/lib/toolchain/effective.js.map +1 -1
- package/packages/tools/lib/toolchain/operations.d.ts +1 -1
- package/packages/tools/lib/toolchain/operations.d.ts.map +1 -1
- package/packages/tools/lib/toolchain/ownership.js +1 -1
- package/packages/tools/lib/toolchain/ownership.js.map +1 -1
- package/packages/tools/lib/toolchain/providers/default-compiler.d.ts +2 -0
- package/packages/tools/lib/toolchain/providers/default-compiler.d.ts.map +1 -0
- package/packages/tools/lib/toolchain/providers/default-compiler.js +10 -0
- package/packages/tools/lib/toolchain/providers/default-compiler.js.map +1 -0
- package/packages/tools/lib/toolchain/providers/opensysml-check.d.ts +18 -0
- package/packages/tools/lib/toolchain/providers/opensysml-check.d.ts.map +1 -1
- package/packages/tools/lib/toolchain/providers/opensysml-check.js +49 -1
- package/packages/tools/lib/toolchain/providers/opensysml-check.js.map +1 -1
- package/packages/tools/lib/toolchain/providers/opensysml.d.ts +19 -0
- package/packages/tools/lib/toolchain/providers/opensysml.d.ts.map +1 -1
- package/packages/tools/lib/toolchain/providers/opensysml.js.map +1 -1
- package/packages/tools/lib/toolchain/user-settings-status.d.ts +1 -1
- package/packages/tools/lib/toolchain/user-settings-status.js +1 -1
- package/packages/tools/lib/toolchain/user-settings-status.js.map +1 -1
- package/packages/tools/lib/validator/architecture-validator.d.ts +5 -1
- package/packages/tools/lib/validator/architecture-validator.d.ts.map +1 -1
- package/packages/tools/lib/validator/architecture-validator.js +54 -7
- package/packages/tools/lib/validator/architecture-validator.js.map +1 -1
- package/packages/tools/lib/validator/constraint-eval.d.ts +5 -0
- package/packages/tools/lib/validator/constraint-eval.d.ts.map +1 -1
- package/packages/tools/lib/validator/constraint-eval.js +20 -19
- package/packages/tools/lib/validator/constraint-eval.js.map +1 -1
- package/packages/tools/lib/validator/model-constraints.d.ts +10 -0
- package/packages/tools/lib/validator/model-constraints.d.ts.map +1 -0
- package/packages/tools/lib/validator/model-constraints.js +94 -0
- package/packages/tools/lib/validator/model-constraints.js.map +1 -0
- package/packages/tools/lib/validator/rule-engine.d.ts +3 -1
- package/packages/tools/lib/validator/rule-engine.d.ts.map +1 -1
- package/packages/tools/lib/validator/rule-engine.js +15 -20
- package/packages/tools/lib/validator/rule-engine.js.map +1 -1
- package/packages/tools/lib/commands/retired.d.ts +0 -10
- package/packages/tools/lib/commands/retired.d.ts.map +0 -1
- package/packages/tools/lib/commands/retired.js +0 -35
- package/packages/tools/lib/commands/retired.js.map +0 -1
- package/packages/tools/lib/commands/validate-client.d.ts +0 -11
- package/packages/tools/lib/commands/validate-client.d.ts.map +0 -1
- package/packages/tools/lib/commands/validate-client.js +0 -54
- package/packages/tools/lib/commands/validate-client.js.map +0 -1
- package/packages/tools/lib/server/dev-validate.d.ts +0 -30
- package/packages/tools/lib/server/dev-validate.d.ts.map +0 -1
- package/packages/tools/lib/server/dev-validate.js +0 -82
- package/packages/tools/lib/server/dev-validate.js.map +0 -1
- package/packages/tools/lib/toolchain/source-fingerprint.d.ts +0 -2
- package/packages/tools/lib/toolchain/source-fingerprint.d.ts.map +0 -1
- package/packages/tools/lib/toolchain/source-fingerprint.js +0 -30
- package/packages/tools/lib/toolchain/source-fingerprint.js.map +0 -1
- package/packages/tools/lib/validator/workspace-boundary-validator.d.ts +0 -9
- package/packages/tools/lib/validator/workspace-boundary-validator.d.ts.map +0 -1
- package/packages/tools/lib/validator/workspace-boundary-validator.js +0 -28
- package/packages/tools/lib/validator/workspace-boundary-validator.js.map +0 -1
|
@@ -0,0 +1,298 @@
|
|
|
1
|
+
// ─── Quantities (browser-safe core): `20 [milli*second]` as a number ─────────────────────────────
|
|
2
|
+
//
|
|
3
|
+
// The builder carries a typed value as the text the source wrote. Comparing two
|
|
4
|
+
// of them needs the factor of each unit and prefix, and those are the standard
|
|
5
|
+
// library's data (`SIPrefixes`, `SI`), not MEMO's: they are read from the
|
|
6
|
+
// library source the package ships (the vendored SysML v2 Release, pinned in
|
|
7
|
+
// corpus/), never written here as a table.
|
|
8
|
+
//
|
|
9
|
+
// The compilers carry the standard library inside themselves and their handoff
|
|
10
|
+
// holds only a name for what a model references from it (checked 2026-10-25
|
|
11
|
+
// against OpenSysML 0.10.0: no `milli` element), so the source is the one place
|
|
12
|
+
// the factors can be read from.
|
|
13
|
+
//
|
|
14
|
+
// A unit is a factor and the powers of the base units it is made of. The base
|
|
15
|
+
// units are the ones SI declares with no conversion and no definition (`s`, `m`,
|
|
16
|
+
// `g`, `A`…); a unit converted by convention or by prefix scales another, and a
|
|
17
|
+
// unit defined by an expression (`Hz = s^-1`, `N = kg*m/s^2`) is that
|
|
18
|
+
// expression's product. A quantity is written `<number> [<expression>]` with the
|
|
19
|
+
// same expression grammar (`*`, `/`, `^n`, parentheses, prefixes by name), so
|
|
20
|
+
// `m/s` and `milli*second` read the same way. Two quantities compare when
|
|
21
|
+
// their base-unit powers are equal.
|
|
22
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
23
|
+
const QUANTITY = /^\s*([-+]?(?:\d+\.?\d*|\.\d+)(?:[eE][-+]?\d+)?)\s*\[([^\]]+)\]\s*$/;
|
|
24
|
+
/** Names are written bare or quoted; the table keys the bare spelling. */
|
|
25
|
+
const bare = (name) => name.trim().replace(/^'|'$/g, '');
|
|
26
|
+
/**
|
|
27
|
+
* `one` is declared in MeasurementReferences.sysml (`attribute one : DimensionOneUnit`):
|
|
28
|
+
* the unit of a pure number, a scale of 1 with no base units.
|
|
29
|
+
*/
|
|
30
|
+
const DIMENSION_ONE = 'one';
|
|
31
|
+
const alone = (a, b) => {
|
|
32
|
+
if (a.offset !== undefined || b?.offset !== undefined) {
|
|
33
|
+
throw new Error('A unit of an interval scale (such as an absolute temperature in degrees Celsius) cannot be combined with another unit');
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
const times = (a, b, sign = 1) => {
|
|
37
|
+
alone(a, b);
|
|
38
|
+
const powers = new Map(a.powers);
|
|
39
|
+
for (const [unit, power] of b.powers) {
|
|
40
|
+
const next = (powers.get(unit) ?? 0) + sign * power;
|
|
41
|
+
if (next === 0)
|
|
42
|
+
powers.delete(unit);
|
|
43
|
+
else
|
|
44
|
+
powers.set(unit, next);
|
|
45
|
+
}
|
|
46
|
+
return { factor: sign === 1 ? a.factor * b.factor : a.factor / b.factor, powers };
|
|
47
|
+
};
|
|
48
|
+
const NONE = { factor: 1, powers: new Map() };
|
|
49
|
+
const power = (a, exponent) => {
|
|
50
|
+
alone(a);
|
|
51
|
+
return {
|
|
52
|
+
factor: a.factor ** exponent,
|
|
53
|
+
powers: new Map([...a.powers].map(([unit, p]) => [unit, p * exponent])),
|
|
54
|
+
};
|
|
55
|
+
};
|
|
56
|
+
/** The base units' powers as text, in name order: `m*s^-1`. */
|
|
57
|
+
const describe = (powers) => {
|
|
58
|
+
const parts = [...powers].sort(([x], [y]) => x.localeCompare(y)).map(([unit, p]) => (p === 1 ? unit : `${unit}^${p}`));
|
|
59
|
+
return parts.length === 0 ? '1' : parts.join('*');
|
|
60
|
+
};
|
|
61
|
+
/**
|
|
62
|
+
* A unit expression as a scale and base-unit powers, names resolved by `lookup`.
|
|
63
|
+
* Grammar: `term (('*' | '/') term)*`, `term := atom ('^' integer)?`,
|
|
64
|
+
* `atom := number | name | '(' expression ')'`; a name is bare or quoted.
|
|
65
|
+
*/
|
|
66
|
+
function evaluateExpression(source, lookup) {
|
|
67
|
+
const tokens = source.match(/'[^']+'|[A-Za-z_\u00C0-\uFFFF][\w\u00C0-\uFFFF]*|\d+\.?\d*(?:[eE][-+]?\d+)?|[-*/^()]/g) ?? [];
|
|
68
|
+
let at = 0;
|
|
69
|
+
const next = () => tokens[at++];
|
|
70
|
+
const fail = (why) => { throw new Error(`The unit expression "${source}" ${why}`); };
|
|
71
|
+
const atom = () => {
|
|
72
|
+
const token = next();
|
|
73
|
+
if (token === undefined)
|
|
74
|
+
return fail('ends early');
|
|
75
|
+
if (token === '(') {
|
|
76
|
+
const inner = product();
|
|
77
|
+
if (next() !== ')')
|
|
78
|
+
fail('has an unclosed parenthesis');
|
|
79
|
+
return inner;
|
|
80
|
+
}
|
|
81
|
+
if (/^\d/.test(token))
|
|
82
|
+
return { factor: Number(token), powers: new Map() };
|
|
83
|
+
const found = lookup(bare(token));
|
|
84
|
+
return found ?? fail(`names "${bare(token)}", which the standard library does not define by a plain factor`);
|
|
85
|
+
};
|
|
86
|
+
const term = () => {
|
|
87
|
+
const base = atom();
|
|
88
|
+
if (tokens[at] !== '^')
|
|
89
|
+
return base;
|
|
90
|
+
at++;
|
|
91
|
+
let sign = 1;
|
|
92
|
+
if (tokens[at] === '-') {
|
|
93
|
+
sign = -1;
|
|
94
|
+
at++;
|
|
95
|
+
}
|
|
96
|
+
const exponent = next();
|
|
97
|
+
if (exponent === undefined || !/^\d+$/.test(exponent))
|
|
98
|
+
return fail('has a power that is not a whole number');
|
|
99
|
+
return power(base, sign * Number(exponent));
|
|
100
|
+
};
|
|
101
|
+
const product = () => {
|
|
102
|
+
let result = term();
|
|
103
|
+
while (tokens[at] === '*' || tokens[at] === '/') {
|
|
104
|
+
const op = next();
|
|
105
|
+
result = times(result, term(), op === '*' ? 1 : -1);
|
|
106
|
+
}
|
|
107
|
+
return result;
|
|
108
|
+
};
|
|
109
|
+
const result = product();
|
|
110
|
+
if (at < tokens.length)
|
|
111
|
+
fail(`has "${tokens[at]}" where an operator was expected`);
|
|
112
|
+
return result;
|
|
113
|
+
}
|
|
114
|
+
/** The prefixes and units a library's two source files declare. */
|
|
115
|
+
export function readUnitTable(siPrefixes, si) {
|
|
116
|
+
const prefixes = new Map();
|
|
117
|
+
const prefixSymbols = {};
|
|
118
|
+
for (const m of siPrefixes.matchAll(/attribute\s+(\w+)\s*:\s*UnitPrefix\s*\{([^}]*?conversionFactor\s*=\s*([0-9.eE+-]+)\s*;)/g)) {
|
|
119
|
+
prefixes.set(m[1], Number(m[3]));
|
|
120
|
+
const symbol = m[2].match(/symbol\s*=\s*"([^"]+)"/);
|
|
121
|
+
if (symbol)
|
|
122
|
+
prefixSymbols[m[1]] = symbol[1];
|
|
123
|
+
}
|
|
124
|
+
const unitSymbols = {};
|
|
125
|
+
const declared = new Map();
|
|
126
|
+
// A declaration is `attribute <short> name : …Unit`, then an expression (`= s^-1`), a body (`{ … }`) or `;`. The body
|
|
127
|
+
// can run over lines (°C's conversion does), so it is matched by its braces.
|
|
128
|
+
for (const head of si.matchAll(/attribute\s+(?:<([^>]+)>\s*)?('[^']+'|\w+)\s*:\s*\w+Unit\b/g)) {
|
|
129
|
+
const [, short, name] = head;
|
|
130
|
+
const entry = { short: short ? bare(short) : undefined };
|
|
131
|
+
let at = head.index + head[0].length;
|
|
132
|
+
let expression = '';
|
|
133
|
+
let body = '';
|
|
134
|
+
for (; at < si.length; at++) {
|
|
135
|
+
const c = si[at];
|
|
136
|
+
if (c === ';')
|
|
137
|
+
break;
|
|
138
|
+
if (c === '{') {
|
|
139
|
+
let depth = 1;
|
|
140
|
+
const start = at + 1;
|
|
141
|
+
for (at = start; at < si.length && depth > 0; at++)
|
|
142
|
+
depth += si[at] === '{' ? 1 : si[at] === '}' ? -1 : 0;
|
|
143
|
+
body = si.slice(start, at);
|
|
144
|
+
break;
|
|
145
|
+
}
|
|
146
|
+
expression += c;
|
|
147
|
+
}
|
|
148
|
+
const defined = expression.match(/=\s*([^,]+?)\s*$/);
|
|
149
|
+
if (defined)
|
|
150
|
+
entry.expression = defined[1];
|
|
151
|
+
const reference = body.match(/referenceUnit\s*=\s*('[^']+'|\w+)/);
|
|
152
|
+
const factor = body.match(/conversionFactor\s*=\s*([0-9.eE+/-]+)/);
|
|
153
|
+
const prefix = body.match(/:>>\s*prefix\s*=\s*(\w+)/);
|
|
154
|
+
if (reference)
|
|
155
|
+
entry.reference = bare(reference[1]);
|
|
156
|
+
if (factor) {
|
|
157
|
+
const [n, d] = factor[1].split('/').map(Number);
|
|
158
|
+
entry.factor = n / (d ?? 1);
|
|
159
|
+
}
|
|
160
|
+
if (prefix)
|
|
161
|
+
entry.prefix = prefix[1];
|
|
162
|
+
declared.set(bare(name), entry);
|
|
163
|
+
if (entry.short) {
|
|
164
|
+
declared.set(entry.short, entry);
|
|
165
|
+
unitSymbols[bare(name)] = entry.short;
|
|
166
|
+
unitSymbols[entry.short] = entry.short;
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
const units = new Map();
|
|
170
|
+
const pending = new Set();
|
|
171
|
+
const unit = (name) => {
|
|
172
|
+
if (name === DIMENSION_ONE)
|
|
173
|
+
return NONE;
|
|
174
|
+
const known = units.get(name);
|
|
175
|
+
if (known)
|
|
176
|
+
return known;
|
|
177
|
+
const entry = declared.get(name);
|
|
178
|
+
if (!entry || pending.has(name))
|
|
179
|
+
return undefined;
|
|
180
|
+
pending.add(name);
|
|
181
|
+
try {
|
|
182
|
+
let result;
|
|
183
|
+
if (entry.expression?.trim() === DIMENSION_ONE) {
|
|
184
|
+
// The library gives the byte, the bit, the decibel, the erlang… the same definition, `= one`, though they
|
|
185
|
+
// are units of different things (1 B is not 1 bit, a level is not a ratio). Each is its own base unit,
|
|
186
|
+
// so two of them compare only when they are the same unit.
|
|
187
|
+
result = { factor: 1, powers: new Map([[entry.short ?? name, 1]]) };
|
|
188
|
+
}
|
|
189
|
+
else if (entry.expression) {
|
|
190
|
+
try {
|
|
191
|
+
result = evaluateExpression(entry.expression, lookup);
|
|
192
|
+
}
|
|
193
|
+
catch {
|
|
194
|
+
result = undefined;
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
else if (entry.reference) {
|
|
198
|
+
const reference = unit(entry.reference);
|
|
199
|
+
const by = entry.prefix ? prefixes.get(entry.prefix) : entry.factor;
|
|
200
|
+
result = reference && by !== undefined ? { factor: by * reference.factor, powers: reference.powers } : undefined;
|
|
201
|
+
}
|
|
202
|
+
else {
|
|
203
|
+
result = { factor: 1, powers: new Map([[entry.short ?? name, 1]]) };
|
|
204
|
+
}
|
|
205
|
+
if (result) {
|
|
206
|
+
units.set(name, result);
|
|
207
|
+
if (entry.short)
|
|
208
|
+
units.set(entry.short, result);
|
|
209
|
+
}
|
|
210
|
+
return result;
|
|
211
|
+
}
|
|
212
|
+
finally {
|
|
213
|
+
pending.delete(name);
|
|
214
|
+
}
|
|
215
|
+
};
|
|
216
|
+
const lookup = (name) => (prefixes.has(name) ? { factor: prefixes.get(name), powers: new Map() } : unit(name));
|
|
217
|
+
for (const name of declared.keys())
|
|
218
|
+
unit(name);
|
|
219
|
+
// Interval scales (`°C_abs`) carry a zero shift: the scale's zero in a reference unit, declared beside them as
|
|
220
|
+
// `zeroDegreeCelsiusInKelvin : ThermodynamicTemperatureValue = 273.15 [K]`.
|
|
221
|
+
for (const m of si.matchAll(/attribute\s+(?:<([^>]+)>\s*)?('[^']+'|\w+)\s*:\s*IntervalScale\s*\{/g)) {
|
|
222
|
+
const start = m.index + m[0].length;
|
|
223
|
+
let depth = 1;
|
|
224
|
+
let end = start;
|
|
225
|
+
for (; end < si.length && depth > 0; end++)
|
|
226
|
+
depth += si[end] === '{' ? 1 : si[end] === '}' ? -1 : 0;
|
|
227
|
+
const block = si.slice(start, end);
|
|
228
|
+
const scale = block.match(/:>>\s*unit\s*=\s*('[^']+'|\w+)/);
|
|
229
|
+
const zero = block.match(/zero\w*\s*:\s*\w+\s*=\s*([-0-9.eE+/]+)\s*\[('[^']+'|\w+)\]/);
|
|
230
|
+
const base = scale && unit(bare(scale[1]));
|
|
231
|
+
const reference = zero && unit(bare(zero[2]));
|
|
232
|
+
if (!base || !reference || !zero)
|
|
233
|
+
continue;
|
|
234
|
+
const [num, den] = zero[1].split('/').map(Number);
|
|
235
|
+
const shift = (num / (den ?? 1)) * reference.factor;
|
|
236
|
+
const result = { factor: base.factor, powers: base.powers, offset: shift };
|
|
237
|
+
units.set(bare(m[2]), result);
|
|
238
|
+
if (m[1])
|
|
239
|
+
units.set(bare(m[1]), result);
|
|
240
|
+
unitSymbols[bare(m[2])] = m[1] ? bare(m[1]) : bare(m[2]);
|
|
241
|
+
if (m[1])
|
|
242
|
+
unitSymbols[bare(m[1])] = bare(m[1]);
|
|
243
|
+
}
|
|
244
|
+
return { prefixes, units, symbols: { prefixes: prefixSymbols, units: unitSymbols } };
|
|
245
|
+
}
|
|
246
|
+
export function unitTableToDTO(table) {
|
|
247
|
+
return {
|
|
248
|
+
prefixes: Object.fromEntries(table.prefixes),
|
|
249
|
+
units: Object.fromEntries([...table.units].map(([name, u]) => [name, { factor: u.factor, powers: Object.fromEntries(u.powers), ...(u.offset !== undefined ? { offset: u.offset } : {}) }])),
|
|
250
|
+
symbols: table.symbols,
|
|
251
|
+
};
|
|
252
|
+
}
|
|
253
|
+
export function unitTableFromDTO(dto) {
|
|
254
|
+
return {
|
|
255
|
+
prefixes: new Map(Object.entries(dto.prefixes)),
|
|
256
|
+
units: new Map(Object.entries(dto.units).map(([name, u]) => [name, { factor: u.factor, powers: new Map(Object.entries(u.powers)), ...(u.offset !== undefined ? { offset: u.offset } : {}) }])),
|
|
257
|
+
symbols: dto.symbols,
|
|
258
|
+
};
|
|
259
|
+
}
|
|
260
|
+
/** Whether the text is written as a quantity, `<number> [<unit>]`. */
|
|
261
|
+
export function looksLikeQuantity(text) {
|
|
262
|
+
return QUANTITY.test(text);
|
|
263
|
+
}
|
|
264
|
+
/**
|
|
265
|
+
* The text as a quantity in base units. Undefined when it is not written as
|
|
266
|
+
* one; throws when it is but a name in its unit is not one the library defines
|
|
267
|
+
* by a plain factor.
|
|
268
|
+
*/
|
|
269
|
+
export function parseQuantity(text, units) {
|
|
270
|
+
const m = text.match(QUANTITY);
|
|
271
|
+
if (!m)
|
|
272
|
+
return undefined;
|
|
273
|
+
const lookup = (name) => {
|
|
274
|
+
const prefix = units.prefixes.get(name);
|
|
275
|
+
if (name === DIMENSION_ONE)
|
|
276
|
+
return NONE;
|
|
277
|
+
return prefix !== undefined ? { factor: prefix, powers: new Map() } : units.units.get(name);
|
|
278
|
+
};
|
|
279
|
+
const unit = evaluateExpression(m[2], lookup);
|
|
280
|
+
return { value: Number(m[1]) * unit.factor + (unit.offset ?? 0), dimension: describe(unit.powers) };
|
|
281
|
+
}
|
|
282
|
+
/**
|
|
283
|
+
* A quantity's number in `unit` (a unit expression, as written inside the brackets), through the base units: the
|
|
284
|
+
* scale and, for an interval scale, the shift. Throws, saying why, when the text is not a quantity or is not in
|
|
285
|
+
* the unit's dimension.
|
|
286
|
+
*/
|
|
287
|
+
export function convertQuantity(text, unit, units) {
|
|
288
|
+
const quantity = parseQuantity(text, units);
|
|
289
|
+
if (!quantity)
|
|
290
|
+
throw new Error(`"${text}" is not a quantity, so it cannot be shown in ${unit}`);
|
|
291
|
+
const zero = parseQuantity(`0 [${unit}]`, units);
|
|
292
|
+
const one = parseQuantity(`1 [${unit}]`, units);
|
|
293
|
+
if (quantity.dimension !== one.dimension) {
|
|
294
|
+
throw new Error(`"${text}" (${quantity.dimension}) is not a quantity in ${unit} (${one.dimension})`);
|
|
295
|
+
}
|
|
296
|
+
return Number(((quantity.value - zero.value) / (one.value - zero.value)).toPrecision(6));
|
|
297
|
+
}
|
|
298
|
+
//# sourceMappingURL=quantity-core.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"quantity-core.js","sourceRoot":"","sources":["../../src/model/quantity-core.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/** The symbols the standard library gives its prefixes and units, by name. */
|
|
2
|
+
export interface UnitSymbolsDTO {
|
|
3
|
+
/** `milli` → `m`. */
|
|
4
|
+
prefixes: Record<string, string>;
|
|
5
|
+
/** `second` → `s`; a unit written by its symbol maps to itself. */
|
|
6
|
+
units: Record<string, string>;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* `20 [milli*second]` as `20 ms`: a prefix followed by `*` and a unit is written
|
|
10
|
+
* joined, other products keep their operator, and a name the library has no
|
|
11
|
+
* symbol for stays as written. Undefined when the text is not a quantity.
|
|
12
|
+
*/
|
|
13
|
+
export declare function formatQuantity(text: string, symbols: UnitSymbolsDTO | undefined): string | undefined;
|
|
14
|
+
//# sourceMappingURL=quantity-format.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"quantity-format.d.ts","sourceRoot":"","sources":["../../src/model/quantity-format.ts"],"names":[],"mappings":"AAMA,8EAA8E;AAC9E,MAAM,WAAW,cAAc;IAC3B,qBAAqB;IACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,mEAAmE;IACnE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAID;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAapG"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
// ─── A quantity as a person writes it: `20 [milli*second]` is `20 ms` ────────
|
|
2
|
+
//
|
|
3
|
+
// Browser-safe: the symbols arrive with the model (read from the standard
|
|
4
|
+
// library by the tools that build it), so no surface carries a table of its own.
|
|
5
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
6
|
+
const QUANTITY = /^\s*([-+]?(?:\d+\.?\d*|\.\d+)(?:[eE][-+]?\d+)?)\s*\[([^\]]+)\]\s*$/;
|
|
7
|
+
/**
|
|
8
|
+
* `20 [milli*second]` as `20 ms`: a prefix followed by `*` and a unit is written
|
|
9
|
+
* joined, other products keep their operator, and a name the library has no
|
|
10
|
+
* symbol for stays as written. Undefined when the text is not a quantity.
|
|
11
|
+
*/
|
|
12
|
+
export function formatQuantity(text, symbols) {
|
|
13
|
+
const m = text.match(QUANTITY);
|
|
14
|
+
if (!m || !symbols)
|
|
15
|
+
return undefined;
|
|
16
|
+
const name = (token) => token.replace(/^'|'$/g, '');
|
|
17
|
+
const parts = m[2].split(/([*/^()])/).map(part => part.trim()).filter(Boolean);
|
|
18
|
+
let out = '';
|
|
19
|
+
for (let i = 0; i < parts.length; i++) {
|
|
20
|
+
const part = parts[i];
|
|
21
|
+
if (part === '*' && i > 0 && i + 1 < parts.length && symbols.prefixes[name(parts[i - 1])] !== undefined && /^[^*/^()]/.test(parts[i + 1]))
|
|
22
|
+
continue;
|
|
23
|
+
if (/^[*/^()]$/.test(part)) {
|
|
24
|
+
out += part === '*' ? '⋅' : part;
|
|
25
|
+
continue;
|
|
26
|
+
}
|
|
27
|
+
out += symbols.prefixes[name(part)] ?? symbols.units[name(part)] ?? name(part);
|
|
28
|
+
}
|
|
29
|
+
return `${m[1]} ${out}`;
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=quantity-format.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"quantity-format.js","sourceRoot":"","sources":["../../src/model/quantity-format.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,EAAE;AACF,0EAA0E;AAC1E,iFAAiF;AACjF,gFAAgF;AAUhF,MAAM,QAAQ,GAAG,oEAAoE,CAAC;AAEtF;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,OAAmC;IAC5E,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/B,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IACrC,MAAM,IAAI,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/E,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAAE,SAAS;QACpJ,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAAC,GAAG,IAAI,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;YAAC,SAAS;QAAC,CAAC;QAC3E,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IACnF,CAAC;IACD,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;AAC5B,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { type Quantity, type UnitTable, type UnitTableDTO } from './quantity-core.js';
|
|
2
|
+
import type { UnitSymbolsDTO } from './quantity-format.js';
|
|
3
|
+
export { looksLikeQuantity, readUnitTable, type Quantity, type UnitTable, type UnitTableDTO } from './quantity-core.js';
|
|
4
|
+
/** The unit table of the shipped library, read on first use. */
|
|
5
|
+
export declare function unitTable(): UnitTable;
|
|
6
|
+
/** The symbols of the library's prefixes and units. */
|
|
7
|
+
export declare function unitSymbols(): UnitSymbolsDTO;
|
|
8
|
+
/** The text as a quantity in base units (see quantity-core.ts), against the shipped library by default. */
|
|
9
|
+
export declare function parseQuantity(text: string, units?: UnitTable): Quantity | undefined;
|
|
10
|
+
/** The table as data for the model to ship, or undefined where this installation has no copy of the library. */
|
|
11
|
+
export declare function libraryUnitTable(): UnitTableDTO | undefined;
|
|
12
|
+
//# sourceMappingURL=quantity.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"quantity.d.ts","sourceRoot":"","sources":["../../src/model/quantity.ts"],"names":[],"mappings":"AAUA,OAAO,EAA6D,KAAK,QAAQ,EAAE,KAAK,SAAS,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACjJ,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,SAAS,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAgBxH,gEAAgE;AAChE,wBAAgB,SAAS,IAAI,SAAS,CAMrC;AAED,uDAAuD;AACvD,wBAAgB,WAAW,IAAI,cAAc,CAE5C;AAED,2GAA2G;AAC3G,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,SAAuB,GAAG,QAAQ,GAAG,SAAS,CAEhG;AAED,gHAAgH;AAChH,wBAAgB,gBAAgB,IAAI,YAAY,GAAG,SAAS,CAE3D"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
// ─── Quantities: the unit table read from the library source ─────────────────
|
|
2
|
+
//
|
|
3
|
+
// The algebra is in quantity-core.ts (browser-safe). This module is the part that
|
|
4
|
+
// reads the library the package ships: the vendored SysML v2 Release's
|
|
5
|
+
// `SIPrefixes.sysml` and `SI.sysml`, never a table written here.
|
|
6
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
7
|
+
import { existsSync, readFileSync } from 'node:fs';
|
|
8
|
+
import { dirname, join, resolve } from 'node:path';
|
|
9
|
+
import { fileURLToPath } from 'node:url';
|
|
10
|
+
import { parseQuantity as parseWith, readUnitTable, unitTableToDTO } from './quantity-core.js';
|
|
11
|
+
export { looksLikeQuantity, readUnitTable } from './quantity-core.js';
|
|
12
|
+
const LIBRARY = join('corpus', 'sysml-v2-release', 'sysml.library', 'Domain Libraries', 'Quantities and Units');
|
|
13
|
+
/** The library directory the factors are read from, found from this module up to the package root. */
|
|
14
|
+
function libraryDirectory() {
|
|
15
|
+
let dir = dirname(fileURLToPath(import.meta.url));
|
|
16
|
+
for (let i = 0; i < 8; i++, dir = resolve(dir, '..')) {
|
|
17
|
+
const candidate = join(dir, LIBRARY);
|
|
18
|
+
if (existsSync(join(candidate, 'SI.sysml')))
|
|
19
|
+
return candidate;
|
|
20
|
+
}
|
|
21
|
+
throw new Error(`The unit library (${LIBRARY}) is not in this installation, so a quantity cannot be read as a number.`);
|
|
22
|
+
}
|
|
23
|
+
let table;
|
|
24
|
+
/** The unit table of the shipped library, read on first use. */
|
|
25
|
+
export function unitTable() {
|
|
26
|
+
if (!table) {
|
|
27
|
+
const dir = libraryDirectory();
|
|
28
|
+
table = readUnitTable(readFileSync(join(dir, 'SIPrefixes.sysml'), 'utf8'), readFileSync(join(dir, 'SI.sysml'), 'utf8'));
|
|
29
|
+
}
|
|
30
|
+
return table;
|
|
31
|
+
}
|
|
32
|
+
/** The symbols of the library's prefixes and units. */
|
|
33
|
+
export function unitSymbols() {
|
|
34
|
+
return unitTable().symbols;
|
|
35
|
+
}
|
|
36
|
+
/** The text as a quantity in base units (see quantity-core.ts), against the shipped library by default. */
|
|
37
|
+
export function parseQuantity(text, units = unitTable()) {
|
|
38
|
+
return parseWith(text, units);
|
|
39
|
+
}
|
|
40
|
+
/** The table as data for the model to ship, or undefined where this installation has no copy of the library. */
|
|
41
|
+
export function libraryUnitTable() {
|
|
42
|
+
try {
|
|
43
|
+
return unitTableToDTO(unitTable());
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
return undefined;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=quantity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"quantity.js","sourceRoot":"","sources":["../../src/model/quantity.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,EAAE;AACF,kFAAkF;AAClF,uEAAuE;AACvE,iEAAiE;AACjE,gFAAgF;AAEhF,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,aAAa,IAAI,SAAS,EAAE,aAAa,EAAE,cAAc,EAAoD,MAAM,oBAAoB,CAAC;AAGjJ,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAoD,MAAM,oBAAoB,CAAC;AAExH,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,kBAAkB,EAAE,eAAe,EAAE,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;AAEhH,sGAAsG;AACtG,SAAS,gBAAgB;IACrB,IAAI,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;QACnD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACrC,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAAE,OAAO,SAAS,CAAC;IAClE,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,qBAAqB,OAAO,0EAA0E,CAAC,CAAC;AAC5H,CAAC;AAED,IAAI,KAA4B,CAAC;AAEjC,gEAAgE;AAChE,MAAM,UAAU,SAAS;IACrB,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,MAAM,GAAG,GAAG,gBAAgB,EAAE,CAAC;QAC/B,KAAK,GAAG,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,kBAAkB,CAAC,EAAE,MAAM,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5H,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,WAAW;IACvB,OAAO,SAAS,EAAE,CAAC,OAAO,CAAC;AAC/B,CAAC;AAED,2GAA2G;AAC3G,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,QAAmB,SAAS,EAAE;IACtE,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAClC,CAAC;AAED,gHAAgH;AAChH,MAAM,UAAU,gBAAgB;IAC5B,IAAI,CAAC;QAAC,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,SAAS,CAAC;IAAC,CAAC;AAC3E,CAAC"}
|
|
@@ -12,6 +12,8 @@ export interface RelationshipEndDTO {
|
|
|
12
12
|
name: string;
|
|
13
13
|
/** Declared end type (a kind name). Undefined ends accept any kind. */
|
|
14
14
|
type?: string;
|
|
15
|
+
/** The SysML construct an element here must have (`port` for an interface's ends), when the language says. */
|
|
16
|
+
construct?: string;
|
|
15
17
|
/** Declared multiplicity, when the ontology states one. */
|
|
16
18
|
multiplicity?: MultiplicityDTO;
|
|
17
19
|
}
|
|
@@ -38,6 +40,12 @@ export interface RelationshipDefinitionDTO {
|
|
|
38
40
|
* resolves in whichever file it is written to without an import.
|
|
39
41
|
*/
|
|
40
42
|
typedDependency?: string;
|
|
43
|
+
/**
|
|
44
|
+
* The package-qualified name of the `connection def`, `interface def` or `flow def`, so a usage typed by it
|
|
45
|
+
* resolves from whichever package it is written into. Absent on a typed dependency, whose `typedDependency`
|
|
46
|
+
* is the qualified name of its metadata def.
|
|
47
|
+
*/
|
|
48
|
+
qualifiedName?: string;
|
|
41
49
|
/**
|
|
42
50
|
* Whether an element may be related to itself by this relation, from the
|
|
43
51
|
* ontology's `isReflexive` attribute. Undefined means the ontology is
|
|
@@ -57,6 +65,11 @@ export interface RelationshipDefinitionDTO {
|
|
|
57
65
|
* serialized as `connection : X connect a to b`.
|
|
58
66
|
*/
|
|
59
67
|
nativeKeyword?: string;
|
|
68
|
+
/**
|
|
69
|
+
* Set for the two constructs that are written as a typed named usage and are not a `connection def`:
|
|
70
|
+
* `interface def` (`interface x : Def connect a to b;`) and `flow def` (`flow x : Def from a to b;`).
|
|
71
|
+
*/
|
|
72
|
+
sysmlConstruct?: 'interface def' | 'flow def';
|
|
60
73
|
/** First declared end — the source/from end. */
|
|
61
74
|
sourceEnd: RelationshipEndDTO;
|
|
62
75
|
/** Second declared end — the target/to end. */
|
|
@@ -79,11 +92,23 @@ export interface KindDefinitionDTO {
|
|
|
79
92
|
* Example: ["assurance", "safety_risk", "analysis"].
|
|
80
93
|
*/
|
|
81
94
|
namespace?: string[];
|
|
95
|
+
/**
|
|
96
|
+
* Where the definition comes from. `ontology` kinds belong to the MEMO ontology and are what a type
|
|
97
|
+
* picker offers; `project` kinds are the project's own definitions, which specialize one of those.
|
|
98
|
+
* Absent on a registry built before this was recorded: read it as `ontology` only if you must.
|
|
99
|
+
*/
|
|
100
|
+
origin?: 'ontology' | 'project';
|
|
82
101
|
}
|
|
83
102
|
/** Both ontology registries in serializable form, as shipped to the client. */
|
|
84
103
|
export interface OntologyRegistriesDTO {
|
|
85
104
|
relationships: RelationshipDefinitionDTO[];
|
|
86
105
|
kinds: KindDefinitionDTO[];
|
|
106
|
+
/**
|
|
107
|
+
* The standard library's prefixes and units with their factors and symbols, read by the tools that
|
|
108
|
+
* build the model, so a surface shows `20 [milli*second]` as `20 ms` and converts a column to one unit
|
|
109
|
+
* without a table of its own.
|
|
110
|
+
*/
|
|
111
|
+
unitTable?: import('./quantity-core.js').UnitTableDTO;
|
|
87
112
|
}
|
|
88
113
|
/** Direction of a relationship relative to the selected element. */
|
|
89
114
|
export type RelationshipDirection = 'outgoing' | 'incoming';
|
|
@@ -109,6 +134,15 @@ export interface RelationshipCreateRequest {
|
|
|
109
134
|
flowItem?: string;
|
|
110
135
|
/** Guard expression, for notations that take one (a guarded succession). */
|
|
111
136
|
guard?: string;
|
|
137
|
+
/**
|
|
138
|
+
* A feature of the source element that is the flow's end, when that is a parameter rather than the element
|
|
139
|
+
* itself (`in rate` of an action, drawn as a pin). Written as the chain `Pkg::fn.rate`; a flow end is any
|
|
140
|
+
* feature (`FlowEndSubsetting`, SysML-textual-bnf.kebnf:871-874). A parameter is not an element of the
|
|
141
|
+
* model, so it is addressed by the element that owns it and its name.
|
|
142
|
+
*/
|
|
143
|
+
sourceFeature?: string;
|
|
144
|
+
/** As `sourceFeature`, for the target end. */
|
|
145
|
+
targetFeature?: string;
|
|
112
146
|
/**
|
|
113
147
|
* IR identity of the source element, from the revision the caller drew
|
|
114
148
|
* against. Checked before anything is written; a stale one is refused
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relationship-legality.d.ts","sourceRoot":"","sources":["../../src/model/relationship-legality.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAIjF,8EAA8E;AAC9E,MAAM,WAAW,eAAe;IAC5B,uDAAuD;IACvD,KAAK,EAAE,MAAM,CAAC;IACd,+CAA+C;IAC/C,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,4CAA4C;AAC5C,MAAM,WAAW,kBAAkB;IAC/B,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,uEAAuE;IACvE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2DAA2D;IAC3D,YAAY,CAAC,EAAE,eAAe,CAAC;CAClC;AAED;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACtC,mFAAmF;IACnF,IAAI,EAAE,MAAM,CAAC;IACb,yEAAyE;IACzE,SAAS,EAAE,MAAM,CAAC;IAClB,iDAAiD;IACjD,KAAK,EAAE,MAAM,CAAC;IACd,gEAAgE;IAChE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6DAA6D;IAC7D,KAAK,EAAE,MAAM,CAAC;IACd,0DAA0D;IAC1D,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gDAAgD;IAChD,SAAS,EAAE,kBAAkB,CAAC;IAC9B,+CAA+C;IAC/C,SAAS,EAAE,kBAAkB,CAAC;CACjC;AAED,yDAAyD;AACzD,MAAM,WAAW,iBAAiB;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,2CAA2C;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,8DAA8D;IAC9D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qEAAqE;IACrE,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"relationship-legality.d.ts","sourceRoot":"","sources":["../../src/model/relationship-legality.ts"],"names":[],"mappings":"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"}
|
|
@@ -111,6 +111,12 @@ export function kindConformsTo(actualKind, expectedKind, kindRegistry) {
|
|
|
111
111
|
}
|
|
112
112
|
return false;
|
|
113
113
|
}
|
|
114
|
+
/** True when `element` may occupy `end`: its kind conforms to the end's type and it has the end's construct. */
|
|
115
|
+
function occupiesEnd(element, end, kinds) {
|
|
116
|
+
if (end.construct && element.construct !== end.construct)
|
|
117
|
+
return false;
|
|
118
|
+
return kindConformsTo(element.kind, end.type, kinds);
|
|
119
|
+
}
|
|
114
120
|
// ─── legalRelationshipDirections ────────────────────────────────────────────
|
|
115
121
|
/**
|
|
116
122
|
* Which ends of `definition` the element may occupy.
|
|
@@ -124,9 +130,9 @@ export function legalRelationshipDirections(selectedElement, definition, registr
|
|
|
124
130
|
return [];
|
|
125
131
|
const kinds = indexKinds(registries.kinds);
|
|
126
132
|
const directions = [];
|
|
127
|
-
if (
|
|
133
|
+
if (occupiesEnd(selectedElement, definition.sourceEnd, kinds))
|
|
128
134
|
directions.push('outgoing');
|
|
129
|
-
if (
|
|
135
|
+
if (occupiesEnd(selectedElement, definition.targetEnd, kinds))
|
|
130
136
|
directions.push('incoming');
|
|
131
137
|
return directions;
|
|
132
138
|
}
|
|
@@ -160,8 +166,8 @@ export function legalRelationshipTypes(sourceElement, targetElement, registries)
|
|
|
160
166
|
if (definition.isAbstract)
|
|
161
167
|
continue;
|
|
162
168
|
// Forward: sourceElement on the source end, targetElement on the target end.
|
|
163
|
-
if (
|
|
164
|
-
|
|
169
|
+
if (occupiesEnd(sourceElement, definition.sourceEnd, kinds) &&
|
|
170
|
+
occupiesEnd(targetElement, definition.targetEnd, kinds)) {
|
|
165
171
|
options.push({
|
|
166
172
|
definition,
|
|
167
173
|
direction: 'outgoing',
|
|
@@ -170,8 +176,8 @@ export function legalRelationshipTypes(sourceElement, targetElement, registries)
|
|
|
170
176
|
});
|
|
171
177
|
}
|
|
172
178
|
// Reverse: targetElement on the source end, sourceElement on the target end.
|
|
173
|
-
if (
|
|
174
|
-
|
|
179
|
+
if (occupiesEnd(targetElement, definition.sourceEnd, kinds) &&
|
|
180
|
+
occupiesEnd(sourceElement, definition.targetEnd, kinds)) {
|
|
175
181
|
options.push({
|
|
176
182
|
definition,
|
|
177
183
|
direction: 'incoming',
|
|
@@ -197,14 +203,14 @@ export function compatibleRelationshipTargets(selectedElement, definition, direc
|
|
|
197
203
|
const oppositeEnd = direction === 'outgoing' ? definition.targetEnd : definition.sourceEnd;
|
|
198
204
|
// The selected element must legally hold its own end, or nothing is offered.
|
|
199
205
|
const ownEnd = direction === 'outgoing' ? definition.sourceEnd : definition.targetEnd;
|
|
200
|
-
if (!
|
|
206
|
+
if (!occupiesEnd(selectedElement, ownEnd, kinds))
|
|
201
207
|
return [];
|
|
202
208
|
const query = filter?.query?.trim().toLowerCase();
|
|
203
209
|
const candidates = [];
|
|
204
210
|
for (const element of Object.values(model.elements)) {
|
|
205
211
|
if (element.id === selectedElement.id)
|
|
206
212
|
continue; // no self-links
|
|
207
|
-
if (!
|
|
213
|
+
if (!occupiesEnd(element, oppositeEnd, kinds))
|
|
208
214
|
continue;
|
|
209
215
|
if (filter?.kind && element.kind !== filter.kind)
|
|
210
216
|
continue;
|
|
@@ -280,10 +286,10 @@ export function validateRelationshipMutation(request, model, registries, context
|
|
|
280
286
|
}
|
|
281
287
|
const kinds = indexKinds(registries.kinds);
|
|
282
288
|
// REL-002 — each endpoint's kind must conform to its declared end type.
|
|
283
|
-
if (!
|
|
289
|
+
if (!occupiesEnd(source, definition.sourceEnd, kinds)) {
|
|
284
290
|
error('REL-002', `${source.kind} cannot occupy the ${definition.sourceEnd.name} end of ${definition.label}`);
|
|
285
291
|
}
|
|
286
|
-
if (!
|
|
292
|
+
if (!occupiesEnd(target, definition.targetEnd, kinds)) {
|
|
287
293
|
error('REL-002', `${target.kind} cannot occupy the ${definition.targetEnd.name} end of ${definition.label}`);
|
|
288
294
|
}
|
|
289
295
|
// REL-008 — the stated direction must match the ends the elements occupy.
|