@things-factory/ops-master 10.1.146 → 10.1.149
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-client/tsconfig.tsbuildinfo +1 -1
- package/dist-server/service/recipe/recipe-revision-content.js +5 -0
- package/dist-server/service/recipe/recipe-revision-content.js.map +1 -1
- package/dist-server/service/recipe/recipe-revision-line.js +1 -1
- package/dist-server/service/recipe/recipe-revision-line.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +7 -7
|
@@ -11,6 +11,8 @@ function required(value, field) {
|
|
|
11
11
|
invalid(field);
|
|
12
12
|
return value.trim();
|
|
13
13
|
}
|
|
14
|
+
/** The places a quantity column keeps (`quantityColumn`, decimal(18, 6)). */
|
|
15
|
+
const QTY_SCALE = 6;
|
|
14
16
|
function lines(value, side) {
|
|
15
17
|
if (!Array.isArray(value) || !value.length)
|
|
16
18
|
invalid(side);
|
|
@@ -24,6 +26,9 @@ function lines(value, side) {
|
|
|
24
26
|
keys.add(lineKey);
|
|
25
27
|
if (typeof line.qty !== 'number' || !Number.isFinite(line.qty) || line.qty <= 0)
|
|
26
28
|
invalid(`${side}.${index}.qty`);
|
|
29
|
+
/* The row keeps six places and twelve before the point; a quantity it would round could not match its signature. */
|
|
30
|
+
if (Number(line.qty.toFixed(QTY_SCALE)) !== line.qty || line.qty >= 1e12)
|
|
31
|
+
invalid(`${side}.${index}.qty`);
|
|
27
32
|
if (side === 'outputs' && line.operation != null)
|
|
28
33
|
invalid('outputs.operation');
|
|
29
34
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recipe-revision-content.js","sourceRoot":"","sources":["../../../server/service/recipe/recipe-revision-content.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"recipe-revision-content.js","sourceRoot":"","sources":["../../../server/service/recipe/recipe-revision-content.ts"],"names":[],"mappings":"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","sourcesContent":["import { Refusal } from '@things-factory/shell'\n\nexport interface RecipeLineContent {\n lineKey: string\n material: string\n qty: number\n operation?: string | null\n}\nexport interface RecipeDraftContent {\n materialDefinitionName: string\n description?: string | null\n route?: string | null\n inputs: RecipeLineContent[]\n outputs: RecipeLineContent[]\n effectiveFrom: Date | string\n reason: string\n}\nfunction invalid(field: string): never {\n throw new Refusal('INVALID_RECIPE_CONTENT', { field }, `Invalid recipe content: ${field}`)\n}\nfunction required(value: unknown, field: string): string {\n if (typeof value !== 'string' || !value.trim()) invalid(field)\n return value.trim()\n}\n/** The places a quantity column keeps (`quantityColumn`, decimal(18, 6)). */\nconst QTY_SCALE = 6\n\nfunction lines(value: unknown, side: 'inputs' | 'outputs'): RecipeLineContent[] {\n if (!Array.isArray(value) || !value.length) invalid(side)\n const keys = new Set<string>()\n return value.map((line, index) => {\n if (!line || typeof line !== 'object') invalid(`${side}.${index}`)\n const lineKey = required(line.lineKey, `${side}.${index}.lineKey`)\n if (keys.has(lineKey)) invalid(`${side}.duplicateLineKey`)\n keys.add(lineKey)\n if (typeof line.qty !== 'number' || !Number.isFinite(line.qty) || line.qty <= 0) invalid(`${side}.${index}.qty`)\n /* The row keeps six places and twelve before the point; a quantity it would round could not match its signature. */\n if (Number(line.qty.toFixed(QTY_SCALE)) !== line.qty || line.qty >= 1e12) invalid(`${side}.${index}.qty`)\n if (side === 'outputs' && line.operation != null) invalid('outputs.operation')\n return {\n lineKey,\n material: required(line.material, `${side}.${index}.material`),\n qty: line.qty,\n ...(side === 'inputs' ? { operation: line.operation == null ? null : required(line.operation, 'operation') } : {})\n }\n })\n}\n/** Stable signed content excludes DB row IDs; array order is meaningful. */\nexport function recipeContentValues(input: Pick<RecipeDraftContent, 'materialDefinitionName' | 'description' | 'route' | 'inputs' | 'outputs'>) {\n const materialDefinitionName = required(input.materialDefinitionName, 'materialDefinitionName')\n if (input.description != null && typeof input.description !== 'string') invalid('description')\n const inputs = lines(input.inputs, 'inputs')\n const outputs = lines(input.outputs, 'outputs')\n if (!outputs.some(line => line.material === materialDefinitionName)) invalid('primaryOutputMissing')\n return {\n materialDefinitionName,\n description: input.description ?? null,\n route: input.route == null ? null : required(input.route, 'route'),\n inputs,\n outputs\n }\n}\nexport function readRecipeContent(input: RecipeDraftContent) {\n if (!input || typeof input !== 'object') invalid('content')\n const from = input.effectiveFrom\n if (!(from instanceof Date) && (typeof from !== 'string' || !/(Z|[+-]\\d{2}:\\d{2})$/.test(from))) invalid('effectiveFrom')\n const effectiveFrom = new Date(from)\n if (!Number.isFinite(effectiveFrom.getTime())) invalid('effectiveFrom')\n return { ...recipeContentValues(input), effectiveFrom, reason: required(input.reason, 'reason') }\n}\n"]}
|
|
@@ -56,7 +56,7 @@ tslib_1.__decorate([
|
|
|
56
56
|
tslib_1.__metadata("design:type", Number)
|
|
57
57
|
], RecipeRevisionLine.prototype, "position", void 0);
|
|
58
58
|
tslib_1.__decorate([
|
|
59
|
-
(0, typeorm_1.Column)(
|
|
59
|
+
(0, typeorm_1.Column)((0, shell_1.quantityColumn)()),
|
|
60
60
|
tslib_1.__metadata("design:type", Number)
|
|
61
61
|
], RecipeRevisionLine.prototype, "qty", void 0);
|
|
62
62
|
let RecipeRevisionInput = class RecipeRevisionInput extends RecipeRevisionLine {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recipe-revision-line.js","sourceRoot":"","sources":["../../../server/service/recipe/recipe-revision-line.ts"],"names":[],"mappings":";;;;AAAA,qCAA0G;AAC1G,
|
|
1
|
+
{"version":3,"file":"recipe-revision-line.js","sourceRoot":"","sources":["../../../server/service/recipe/recipe-revision-line.ts"],"names":[],"mappings":";;;;AAAA,qCAA0G;AAC1G,iDAA8D;AAM9D,uGAAuG;AACvG,MAAe,kBAAkB;CAgBhC;AAfiC;IAA/B,IAAA,gCAAsB,EAAC,MAAM,CAAC;;8CAAW;AACI;IAA7C,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,cAAM,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;sCAAS,cAAM;kDAAA;AACP;IAApD,IAAA,oBAAU,EAAC,CAAC,GAAuB,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC;;oDAAiB;AACmB;IAAvF,IAAA,mBAAS,EAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,2BAA2B,EAAE,KAAK,EAAE,CAAC;;kDAAyB;AAC3D;IAApD,IAAA,oBAAU,EAAC,CAAC,GAAuB,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC;;oDAAiB;AACiB;IAArF,IAAA,mBAAS,EAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,2BAA2B,EAAE,KAAK,EAAE,CAAC;;oDAAyB;AACvD;IAAtD,IAAA,oBAAU,EAAC,CAAC,GAAuB,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;;sDAAmB;AACiB;IAAzF,IAAA,mBAAS,EAAC,oBAAoB,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,2BAA2B,EAAE,KAAK,EAAE,CAAC;;8DAAuC;AAC/D;IAAhE,IAAA,oBAAU,EAAC,CAAC,GAAuB,EAAE,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC;;gEAA6B;AAE1E;IAAlB,IAAA,gBAAM,EAAC,SAAS,CAAC;;oDAAiB;AAChB;IAAlB,IAAA,gBAAM,EAAC,SAAS,CAAC;;mDAAgB;AACnB;IAAd,IAAA,gBAAM,EAAC,KAAK,CAAC;;oDAAiB;AAEL;IAAzB,IAAA,gBAAM,EAAC,IAAA,sBAAc,GAAE,CAAC;;+CAAY;AAShC,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,kBAAkB;CAI1D,CAAA;AAJY,kDAAmB;AAC4D;IAAzF,IAAA,mBAAS,EAAC,qBAAqB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,2BAA2B,EAAE,KAAK,EAAE,CAAC;;gEAAgD;AACtE;IAAlE,IAAA,oBAAU,EAAC,CAAC,GAAwB,EAAE,EAAE,CAAC,GAAG,CAAC,mBAAmB,CAAC;;kEAAqC;AAChE;IAAtC,IAAA,gBAAM,EAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sDAAyB;8BAHpD,mBAAmB;IAN/B,IAAA,gBAAM,EAAC,2BAA2B,CAAC;IACnC,IAAA,eAAK,EAAC,sBAAsB,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACxE,IAAA,eAAK,EAAC,0BAA0B,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAC7E,IAAA,oBAAU,EAAC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IACpH,IAAA,oBAAU,EAAC,oBAAoB,EAAE,CAAC,QAAQ,EAAE,oBAAoB,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IAC9G,IAAA,oBAAU,EAAC,qBAAqB,EAAE,CAAC,QAAQ,EAAE,qBAAqB,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;GACpG,mBAAmB,CAI/B;AAOM,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,kBAAkB;CAAG,CAAA;AAAlD,oDAAoB;+BAApB,oBAAoB;IALhC,IAAA,gBAAM,EAAC,4BAA4B,CAAC;IACpC,IAAA,eAAK,EAAC,uBAAuB,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACzE,IAAA,eAAK,EAAC,2BAA2B,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAC9E,IAAA,oBAAU,EAAC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IACpH,IAAA,oBAAU,EAAC,oBAAoB,EAAE,CAAC,QAAQ,EAAE,oBAAoB,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;GAClG,oBAAoB,CAA8B","sourcesContent":["import { Column, Entity, ForeignKey, Index, ManyToOne, PrimaryGeneratedColumn, RelationId } from 'typeorm'\nimport { Domain, quantityColumn } from '@things-factory/shell'\nimport type { MaterialDefinition } from '../material/material-definition'\nimport type { OperationDefinition } from '../operation/operation-definition'\nimport type { RecipeDefinition } from './recipe-definition'\nimport type { RecipeRevision } from './recipe-revision'\n\n/** Owned rows, not independently publishable masters. Keys survive derivation for structural diffs. */\nabstract class RecipeRevisionLine {\n @PrimaryGeneratedColumn('uuid') id: string\n @ManyToOne(() => Domain, { nullable: false }) domain: Domain\n @RelationId((row: RecipeRevisionLine) => row.domain) domainId: string\n @ManyToOne('RecipeDefinition', { nullable: false, createForeignKeyConstraints: false }) recipe: RecipeDefinition\n @RelationId((row: RecipeRevisionLine) => row.recipe) recipeId: string\n @ManyToOne('RecipeRevision', { nullable: false, createForeignKeyConstraints: false }) revision: RecipeRevision\n @RelationId((row: RecipeRevisionLine) => row.revision) revisionId: string\n @ManyToOne('MaterialDefinition', { nullable: false, createForeignKeyConstraints: false }) materialDefinition: MaterialDefinition\n @RelationId((row: RecipeRevisionLine) => row.materialDefinition) materialDefinitionId: string\n /** Frozen business key: a subsequent master rename cannot rewrite signed content. */\n @Column('varchar') material: string\n @Column('varchar') lineKey: string\n @Column('int') position: number\n /* A decimal, not 'double precision': that name is Postgres's alone, and a float does not hold 0.1 (ADR-0128). */\n @Column(quantityColumn()) qty: number\n}\n\n@Entity('ops_recipe_revision_input')\n@Index('ix_recipe_input_line', ['revision', 'lineKey'], { unique: true })\n@Index('ix_recipe_input_position', ['revision', 'position'], { unique: true })\n@ForeignKey('RecipeRevision', ['domain', 'recipe', 'revision'], ['domain', 'recipe', 'id'], { onDelete: 'RESTRICT' })\n@ForeignKey('MaterialDefinition', ['domain', 'materialDefinition'], ['domain', 'id'], { onDelete: 'RESTRICT' })\n@ForeignKey('OperationDefinition', ['domain', 'operationDefinition'], ['domain', 'id'], { onDelete: 'RESTRICT' })\nexport class RecipeRevisionInput extends RecipeRevisionLine {\n @ManyToOne('OperationDefinition', { nullable: true, createForeignKeyConstraints: false }) operationDefinition: OperationDefinition | null\n @RelationId((row: RecipeRevisionInput) => row.operationDefinition) operationDefinitionId: string | null\n @Column('varchar', { nullable: true }) operation: string | null\n}\n\n@Entity('ops_recipe_revision_output')\n@Index('ix_recipe_output_line', ['revision', 'lineKey'], { unique: true })\n@Index('ix_recipe_output_position', ['revision', 'position'], { unique: true })\n@ForeignKey('RecipeRevision', ['domain', 'recipe', 'revision'], ['domain', 'recipe', 'id'], { onDelete: 'RESTRICT' })\n@ForeignKey('MaterialDefinition', ['domain', 'materialDefinition'], ['domain', 'id'], { onDelete: 'RESTRICT' })\nexport class RecipeRevisionOutput extends RecipeRevisionLine {}\n"]}
|