@vertesia/build-tools 1.6.0-dev.20260918.115658Z → 1.6.0-dev.20261004.085740Z
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../../src/core/transformers/prompt.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,KAAK,UAAU,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;AAEpC;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,YAAY,CAAC;AAoB7C;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;;;;iBAOjC,CAAC;AAEH;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../../src/core/transformers/prompt.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,KAAK,UAAU,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;AAEpC;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,YAAY,CAAC;AAoB7C;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;;;;iBAOjC,CAAC;AAEH;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAkHtE;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,iBAAiB,EAAE,iBA6D/B,CAAC"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
import path from 'node:path';
|
|
6
6
|
import { PromptRole } from '@llumiverse/common';
|
|
7
7
|
import { TemplateType } from '@vertesia/common';
|
|
8
|
-
import { executeHandlebars } from '@vertesia/studio-utils';
|
|
8
|
+
import { describeTemplateSystemVariables, executeHandlebars, HANDLEBARS_HELPER_NAMES } from '@vertesia/studio-utils';
|
|
9
9
|
import { z } from 'zod';
|
|
10
10
|
import { parseFrontmatter } from '../parsers/frontmatter.js';
|
|
11
11
|
/**
|
|
@@ -125,7 +125,8 @@ function validatePromptContent(content, contentType, filePath) {
|
|
|
125
125
|
const result = executeHandlebars(content, {}, {});
|
|
126
126
|
if (!result.success) {
|
|
127
127
|
throw new Error(`Invalid Handlebars prompt in ${filePath}: ${result.error}\n\n` +
|
|
128
|
-
|
|
128
|
+
`Supported helpers are: ${HANDLEBARS_HELPER_NAMES.join(', ')}. ` +
|
|
129
|
+
`System variables available without declaration: ${describeTemplateSystemVariables()}. ` +
|
|
129
130
|
'For array formatting, use {{#each items}}...{{/each}} rather than an unregistered helper such as {{join items ", "}}.');
|
|
130
131
|
}
|
|
131
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/core/transformers/prompt.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAmB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/core/transformers/prompt.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vertesia/build-tools",
|
|
3
|
-
"version": "1.6.0-dev.
|
|
3
|
+
"version": "1.6.0-dev.20261004.085740Z",
|
|
4
4
|
"description": "Build tools for Vertesia projects - import transformers (skill / template / prompt / raw), esbuild widget bundler, vertesia-build CLI, and a Vite dev plugin",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -10,7 +10,8 @@
|
|
|
10
10
|
},
|
|
11
11
|
"files": [
|
|
12
12
|
"lib",
|
|
13
|
-
"src"
|
|
13
|
+
"src",
|
|
14
|
+
"!src/**/*.test.*"
|
|
14
15
|
],
|
|
15
16
|
"license": "Apache-2.0",
|
|
16
17
|
"exports": {
|
|
@@ -26,25 +27,25 @@
|
|
|
26
27
|
"devDependencies": {
|
|
27
28
|
"@hono/node-server": "^2.1.1",
|
|
28
29
|
"@types/js-yaml": "^4.0.9",
|
|
29
|
-
"@types/node": "^24.13.
|
|
30
|
+
"@types/node": "^24.13.6",
|
|
30
31
|
"@vertesia/tsconfig": "0.1.0",
|
|
31
32
|
"typescript": "7.0.2",
|
|
32
|
-
"vite": "8.
|
|
33
|
-
"vitest": "5.0.
|
|
33
|
+
"vite": "8.3.0",
|
|
34
|
+
"vitest": "5.0.1"
|
|
34
35
|
},
|
|
35
36
|
"dependencies": {
|
|
36
|
-
"@llumiverse/common": "1.6.0-dev.
|
|
37
|
-
"@vertesia/common": "1.6.0-dev.
|
|
38
|
-
"@vertesia/studio-utils": "1.6.0-dev.
|
|
37
|
+
"@llumiverse/common": "1.6.0-dev.20261004.083934Z",
|
|
38
|
+
"@vertesia/common": "1.6.0-dev.20261004.085740Z",
|
|
39
|
+
"@vertesia/studio-utils": "1.6.0-dev.20261004.085740Z",
|
|
39
40
|
"ajv": "^8.20.0",
|
|
40
41
|
"es-module-lexer": "^3.0.2",
|
|
41
42
|
"esbuild": "^0.28.2",
|
|
42
|
-
"js-yaml": "^5.4.
|
|
43
|
-
"zod": "
|
|
43
|
+
"js-yaml": "^5.4.2",
|
|
44
|
+
"zod": "4.6.5"
|
|
44
45
|
},
|
|
45
46
|
"peerDependencies": {
|
|
46
47
|
"@hono/node-server": "^2.1.1",
|
|
47
|
-
"vite": "^8.
|
|
48
|
+
"vite": "^8.3.0"
|
|
48
49
|
},
|
|
49
50
|
"peerDependenciesMeta": {
|
|
50
51
|
"@hono/node-server": {
|
|
@@ -75,13 +76,13 @@
|
|
|
75
76
|
"zod",
|
|
76
77
|
"validation"
|
|
77
78
|
],
|
|
78
|
-
"gitHead": "
|
|
79
|
+
"gitHead": "b51b6dc9262f81f55e2424d1e57190060f6068d7",
|
|
79
80
|
"scripts": {
|
|
80
81
|
"lint": "biome lint src",
|
|
81
82
|
"test": "vitest run",
|
|
82
|
-
"typecheck:test": "tsc -p tsconfig.test.json --noEmit",
|
|
83
|
+
"typecheck:test": "tsc --checkers 1 -p tsconfig.test.json --noEmit",
|
|
83
84
|
"clean:lib": "rimraf ./lib ./tsconfig.tsbuildinfo",
|
|
84
|
-
"build": "pnpm run clean:lib && tsc -p tsconfig.json && chmod +x ./lib/bin/build.js",
|
|
85
|
+
"build": "pnpm run clean:lib && tsc --checkers 1 -p tsconfig.json && chmod +x ./lib/bin/build.js",
|
|
85
86
|
"clean": "rimraf ./node_modules ./lib ./tsconfig.tsbuildinfo"
|
|
86
87
|
}
|
|
87
88
|
}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import path from 'node:path';
|
|
7
7
|
import { PromptRole } from '@llumiverse/common';
|
|
8
8
|
import { type JSONSchema, TemplateType } from '@vertesia/common';
|
|
9
|
-
import { executeHandlebars } from '@vertesia/studio-utils';
|
|
9
|
+
import { describeTemplateSystemVariables, executeHandlebars, HANDLEBARS_HELPER_NAMES } from '@vertesia/studio-utils';
|
|
10
10
|
import { z } from 'zod';
|
|
11
11
|
import { parseFrontmatter } from '../parsers/frontmatter.js';
|
|
12
12
|
import type { TransformerPreset } from '../types.js';
|
|
@@ -162,7 +162,8 @@ function validatePromptContent(content: string, contentType: TemplateType, fileP
|
|
|
162
162
|
if (!result.success) {
|
|
163
163
|
throw new Error(
|
|
164
164
|
`Invalid Handlebars prompt in ${filePath}: ${result.error}\n\n` +
|
|
165
|
-
|
|
165
|
+
`Supported helpers are: ${HANDLEBARS_HELPER_NAMES.join(', ')}. ` +
|
|
166
|
+
`System variables available without declaration: ${describeTemplateSystemVariables()}. ` +
|
|
166
167
|
'For array formatting, use {{#each items}}...{{/each}} rather than an unregistered helper such as {{join items ", "}}.',
|
|
167
168
|
);
|
|
168
169
|
}
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
import { describe, expect, it } from 'vitest';
|
|
2
|
-
import { apiServerPlugin, injectRuntimeConfigMarker } from './api-server.js';
|
|
3
|
-
|
|
4
|
-
describe('apiServerPlugin runtime configuration marker', () => {
|
|
5
|
-
it('injects the versioned marker into application HTML', () => {
|
|
6
|
-
expect(injectRuntimeConfigMarker('<html><head><title>App</title></head></html>')).toContain(
|
|
7
|
-
'<meta name="vertesia-runtime-config" content="v1" />',
|
|
8
|
-
);
|
|
9
|
-
});
|
|
10
|
-
|
|
11
|
-
it('does not duplicate an existing runtime configuration marker', () => {
|
|
12
|
-
const html = '<html><head><meta content="v1" name="vertesia-runtime-config"><title>App</title></head></html>';
|
|
13
|
-
|
|
14
|
-
expect(injectRuntimeConfigMarker(html)).toBe(html);
|
|
15
|
-
});
|
|
16
|
-
|
|
17
|
-
it('records the explicit app auth mode for the serving gateway', () => {
|
|
18
|
-
expect(injectRuntimeConfigMarker('<head></head>', 'firebase')).toContain('data-auth-mode="firebase"');
|
|
19
|
-
expect(injectRuntimeConfigMarker('<head></head>', 'central')).toContain('data-auth-mode="central"');
|
|
20
|
-
expect(() => injectRuntimeConfigMarker('<head></head>', 'typo')).toThrow('VITE_AUTH_MODE');
|
|
21
|
-
});
|
|
22
|
-
|
|
23
|
-
it('updates an existing marker with the build mode without duplicating it', () => {
|
|
24
|
-
const html = '<head><meta name="vertesia-runtime-config" content="v1" /></head>';
|
|
25
|
-
const result = injectRuntimeConfigMarker(html, 'firebase');
|
|
26
|
-
expect(result.match(/vertesia-runtime-config/g)).toHaveLength(1);
|
|
27
|
-
expect(result).toContain('data-auth-mode="firebase"');
|
|
28
|
-
});
|
|
29
|
-
|
|
30
|
-
it('includes marker emission in the existing API server plugin set', () => {
|
|
31
|
-
expect(apiServerPlugin().map((plugin) => plugin.name)).toContain('vertesia-runtime-config-marker');
|
|
32
|
-
});
|
|
33
|
-
});
|