@vibes.diy/api-svc 4.4.5 → 4.5.5
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/intern/prompt-assembly.d.ts +1 -0
- package/intern/prompt-assembly.js +11 -7
- package/intern/prompt-assembly.js.map +1 -1
- package/package.json +12 -15
- package/public/access-function.js +73 -15
- package/public/access-function.js.map +1 -1
- package/public/access-helpers.js +5 -1
- package/public/access-helpers.js.map +1 -1
- package/public/app-documents-broadcast.d.ts +36 -0
- package/public/app-documents-broadcast.js +99 -0
- package/public/app-documents-broadcast.js.map +1 -0
- package/public/app-documents-grant-delta.d.ts +13 -0
- package/public/app-documents-grant-delta.js +76 -0
- package/public/app-documents-grant-delta.js.map +1 -0
- package/public/app-documents-put-persist.d.ts +28 -0
- package/public/app-documents-put-persist.js +106 -0
- package/public/app-documents-put-persist.js.map +1 -0
- package/public/app-documents-read-eventos.js +1 -1
- package/public/app-documents-read-eventos.js.map +1 -1
- package/public/app-documents-write-eventos.js +74 -282
- package/public/app-documents-write-eventos.js.map +1 -1
- package/public/app-settings-icon-gen.d.ts +8 -0
- package/public/app-settings-icon-gen.js +29 -0
- package/public/app-settings-icon-gen.js.map +1 -0
- package/public/app-settings-secrets.d.ts +5 -0
- package/public/app-settings-secrets.js +92 -0
- package/public/app-settings-secrets.js.map +1 -0
- package/public/app-settings-sql-upsert.d.ts +5 -0
- package/public/app-settings-sql-upsert.js +139 -0
- package/public/app-settings-sql-upsert.js.map +1 -0
- package/public/app-settings-suggestion-bless.d.ts +4 -0
- package/public/app-settings-suggestion-bless.js +88 -0
- package/public/app-settings-suggestion-bless.js.map +1 -0
- package/public/ensure-app-settings.d.ts +5 -5
- package/public/ensure-app-settings.js +6 -337
- package/public/ensure-app-settings.js.map +1 -1
- package/public/fs-prompt.d.ts +16 -0
- package/public/fs-prompt.js +173 -0
- package/public/fs-prompt.js.map +1 -0
- package/public/image-gen.d.ts +15 -0
- package/public/image-gen.js +222 -0
- package/public/image-gen.js.map +1 -0
- package/public/llm-dispatch.d.ts +113 -0
- package/public/llm-dispatch.js +621 -0
- package/public/llm-dispatch.js.map +1 -0
- package/public/prompt-chat-section.d.ts +5 -41
- package/public/prompt-chat-section.js +10 -1607
- package/public/prompt-chat-section.js.map +1 -1
- package/public/provider-errors.d.ts +55 -0
- package/public/provider-errors.js +150 -0
- package/public/provider-errors.js.map +1 -0
- package/public/set-mode-fsid.js +2 -2
- package/public/set-mode-fsid.js.map +1 -1
- package/public/stream-assembly.d.ts +38 -0
- package/public/stream-assembly.js +470 -0
- package/public/stream-assembly.js.map +1 -0
|
@@ -21,6 +21,7 @@ export interface AssemblePromptPayloadArgs {
|
|
|
21
21
|
enrichedPrompt?: string;
|
|
22
22
|
};
|
|
23
23
|
readonly attachScreenshot?: boolean;
|
|
24
|
+
readonly degradeAttachments?: boolean;
|
|
24
25
|
}
|
|
25
26
|
export declare function assemblePromptPayload(vctx: VibesApiSQLCtx, args: AssemblePromptPayloadArgs): Promise<Result<{
|
|
26
27
|
model: string;
|
|
@@ -8,7 +8,7 @@ import { createPromptAssetFetch, promptsPkgBaseUrl } from "./prompt-asset-fetch.
|
|
|
8
8
|
import { loadModels } from "../public/list-models.js";
|
|
9
9
|
import { loadLatestScreenshotDataUrl } from "./latest-screenshot.js";
|
|
10
10
|
import { modelSupportsImageInput } from "./model-vision.js";
|
|
11
|
-
import { inflateFileAttachments } from "./inflate-file-attachments.js";
|
|
11
|
+
import { inflateFileAttachments, stripVibesFileBlocks } from "./inflate-file-attachments.js";
|
|
12
12
|
import { assembleSlotMessages, renderSlotMessagesAs } from "./slot-assembler.js";
|
|
13
13
|
import { loadLatestPromptId, loadVersionTimeline, selectSlotSources } from "./version-timeline.js";
|
|
14
14
|
const SCREENSHOT_CAPTION = "Attached is a screenshot of the app as it currently renders, for visual reference. Use it to ground layout, spacing, color, and alignment edits.";
|
|
@@ -197,7 +197,9 @@ export async function assemblePromptPayload(vctx, args) {
|
|
|
197
197
|
const slotChatMessages = renderSlotMessagesAs(slotMessages, slotDeliveryMode);
|
|
198
198
|
let finalNewUser = newUserOnly;
|
|
199
199
|
const wantsScreenshot = args.attachScreenshot === true && !isInitial;
|
|
200
|
-
const supportsImages = wantsScreenshot || hasFileRefs
|
|
200
|
+
const supportsImages = wantsScreenshot || (hasFileRefs && args.degradeAttachments !== true)
|
|
201
|
+
? await modelSupportsImageInputViaCatalog(vctx, model)
|
|
202
|
+
: false;
|
|
201
203
|
if (wantsScreenshot && supportsImages) {
|
|
202
204
|
const fsIdsNewestFirst = timeline.map((t) => t.fsId).reverse();
|
|
203
205
|
const shot = await loadLatestScreenshotDataUrl(vctx, fsIdsNewestFirst);
|
|
@@ -234,11 +236,13 @@ export async function assemblePromptPayload(vctx, args) {
|
|
|
234
236
|
];
|
|
235
237
|
const fileAttachmentScope = "appScope" in activeSettings ? activeSettings.appScope : undefined;
|
|
236
238
|
const messages = hasFileRefs
|
|
237
|
-
?
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
239
|
+
? args.degradeAttachments === true
|
|
240
|
+
? stripVibesFileBlocks(assembled)
|
|
241
|
+
: await inflateFileAttachments(vctx, {
|
|
242
|
+
messages: assembled,
|
|
243
|
+
scope: fileAttachmentScope,
|
|
244
|
+
modelSupportsImages: supportsImages,
|
|
245
|
+
})
|
|
242
246
|
: assembled;
|
|
243
247
|
return Result.Ok({
|
|
244
248
|
model,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-assembly.js","sourceRoot":"","sources":["../../jsr/intern/prompt-assembly.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAEL,WAAW,EACX,kBAAkB,EAClB,oBAAoB,EACpB,sBAAsB,EACtB,cAAc,EACd,aAAa,EACb,aAAa,EACb,WAAW,EACX,iBAAiB,GAGlB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAe,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACxG,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAQnG,MAAM,kBAAkB,GACtB,kJAAkJ,CAAC;AAWrJ,MAAM,UAAU,+BAA+B,CAAC,WAAiC,EAAE,IAAI,GAAoB,EAAE;IAC3G,MAAM,QAAQ,GAAkB,EAAE,CAAC;IACnC,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,IAAI,eAAmC,CAAC;IACxC,IAAI,WAAW,GAAuE,IAAI,CAAC;IAE3F,SAAS,cAAc;QACrB,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QACxC,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;SAC7D,CAAC,CAAC;QACH,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC9B,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,WAAW,CAAC,GAAG,CAAC;gBACnB,cAAc,EAAE,CAAC;gBAIjB,eAAe,GAAG,GAAG,CAAC,QAAQ,CAAC;gBAC/B,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC;gBACxE,MAAM;YACR,KAAK,cAAc,CAAC,GAAG,CAAC;gBACtB,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC9B,MAAM;YACR,KAAK,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtB,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,KAAK,SAAS,IAAI,eAAe,KAAK,IAAI,CAAC,oBAAoB,CAAC;gBACzG,IAAI,OAAO,EAAE,CAAC;oBACZ,WAAW,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,SAAS,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;gBAC9D,CAAC;qBAAM,CAAC;oBACN,cAAc,CAAC,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;gBACxC,CAAC;gBACD,MAAM;YACR,CAAC;YACD,KAAK,UAAU,CAAC,GAAG,CAAC;gBAClB,IAAI,WAAW,EAAE,CAAC;oBAChB,WAAW,CAAC,SAAS,EAAE,CAAC;oBACxB,IAAI,CAAC,WAAW,CAAC,aAAa,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC7D,WAAW,CAAC,aAAa,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC9C,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAChC,CAAC;gBACD,MAAM;YACR,KAAK,SAAS,CAAC,GAAG,CAAC;gBACjB,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,MAAM,GAAG,WAAW,CAAC,aAAa,KAAK,gBAAgB,CAAC;oBAC9D,IAAI,MAAM,EAAE,CAAC;wBACX,cAAc,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,SAAS,iBAAiB,WAAW,CAAC,IAAI,GAAG,CAAC,CAAC;oBACrF,CAAC;yBAAM,CAAC;wBACN,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC;wBAC9E,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC;wBAC9B,cAAc,CAAC,IAAI,CAAC,YAAY,WAAW,CAAC,IAAI,MAAM,KAAK,WAAW,KAAK,SAAS,CAAC,CAAC;oBACxF,CAAC;oBACD,WAAW,GAAG,IAAI,CAAC;gBACrB,CAAC;qBAAM,CAAC;oBACN,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC7B,CAAC;gBACD,MAAM;QACV,CAAC;IACH,CAAC;IACD,cAAc,EAAE,CAAC;IACjB,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,IAAoB,EACpB,MAAc;IASd,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CACxC,IAAI,CAAC,GAAG,CAAC,EAAE;SACR,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;SAChH,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;SAClC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACtD,KAAK,CAAC,CAAC,CAAC;SACR,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrB,CAAC;IACF,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE;QAAE,OAAO,EAAE,CAAC;IAC5C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;IAC5C,MAAM,QAAQ,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAC1C,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CACvC,IAAI,CAAC,GAAG,CAAC,EAAE;SACR,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;SAC1D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC;SACjC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;SACtH,KAAK,CAAC,CAAC,CAAC;SACR,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrB,CAAC;IAKF,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;QAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpD,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAkB,CAAC;IAC5D,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,MAAM;QAC5C,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,KAAK;QACzC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,KAAK;QACzC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,cAAc;QACpE,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,KAAK;QAC3D,QAAQ;KACT,CAAC;AACJ,CAAC;AAwCD,KAAK,UAAU,iCAAiC,CAAC,IAAoB,EAAE,OAAe;IACpF,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;QACpB,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;QACrH,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,uBAAuB,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,IAAoB,EACpB,IAA+B;IAY/B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAChD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;SAC/B,MAAM,EAAE;SACR,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;SAClC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACtD,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAIjD,MAAM,cAAc,GAAyB,EAAE,CAAC;IAChD,KAAK,MAAM,UAAU,IAAI,QAAQ,EAAE,CAAC;QAClC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,iBAAiB,CAAC,UAAU,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;QACpH,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC5G,CAAC;QACD,cAAc,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;IACtC,CAAC;IAID,MAAM,cAAc,GAAG,MAAM,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC/D,IAAI,cAAc,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAE9D,MAAM,oBAAoB,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACpE,IAAI,oBAAoB,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAE1E,MAAM,QAAQ,GAAG,cAAc,CAAC,EAAE,EAAE,CAAC;IACrC,MAAM,cAAc,GAAG,oBAAoB,CAAC,EAAE,EAAE,CAAC;IAMjD,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,EAAE,UAAU,KAAK,KAAK,CAAC;IAC5D,MAAM,aAAa,GAAG,+BAA+B,CAAC,cAAc,EAAE;QACpE,oBAAoB,EAAE,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;KACtE,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,CAAC,GAAG,aAAa,EAAE,GAAG,WAAW,CAAC,CAAC,IAAI,CACzD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,CAC3E,CAAC;IAQF,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,IAAI,CAAC,MAAM,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC/F,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,cAAc,CAAC;IAIhE,MAAM,YAAY,GAAG,cAAc,IAAI,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;IAChG,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC;IAQxC,MAAM,YAAY,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAC5D,MAAM,YAAY,GAAG,SAAS,IAAI,YAAY,CAAC;IAE/C,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,KAAK,IAAI,EAAE;QACrD,OAAO,oBAAoB,CAAC,KAAK,EAAE;YACjC,MAAM;YACN,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YACvC,KAAK;YACL,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS;YACzD,QAAQ,EAAE,KAAK;YAIf,0BAA0B,EAAE,CAAC,YAAY,IAAI,OAAO,CAAC,KAAK,CAAC;YAC3D,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;YAC/C,UAAU,EAAE,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC;YAC7D,KAAK,EAAE,sBAAsB,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;SAC/D,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,IAAI,YAAY,CAAC,KAAK,EAAE,EAAE,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC;QACrE,OAAO,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAClC,CAAC;IACD,MAAM,cAAc,GAAG,CAAC,GAAG,aAAa,EAAE,GAAG,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IACzF,IAAI,cAAc,KAAK,KAAK,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;IAC5D,CAAC;IAKD,MAAM,WAAW,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAGhD,IAAI,eAAqG,CAAC;IAC1G,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC;IAC1B,IAAI,GAAG,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC;YACb,eAAe,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC;QACpF,CAAC;IACH,CAAC;IAID,MAAM,gBAAgB,GACpB,IAAI,CAAC,QAAQ,EAAE,IAAI,KAAK,OAAO;QAC7B,CAAC,CAAC,IAAI,GAAG,CACL,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAChC,CAAC,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CACzF,CACF;QACH,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,YAAY,GAAG,oBAAoB,CAAC;QACxC,QAAQ,EAAE,WAAW,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS;QAC3H,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,GAAG;QAC7B,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,GAAG;QACnC,eAAe;QACf,aAAa,EAAE,gBAAgB;QAC/B,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,SAAS;QACtC,MAAM,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;KACzB,CAAC,CAAC;IAGH,MAAM,gBAAgB,GACpB,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACvG,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;IAO9E,IAAI,YAAY,GAAG,WAAW,CAAC;IAC/B,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC;IACrE,MAAM,cAAc,GAAG,eAAe,IAAI,WAAW,CAAC,CAAC,CAAC,MAAM,iCAAiC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACrH,IAAI,eAAe,IAAI,cAAc,EAAE,CAAC;QACtC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;QAC/D,MAAM,IAAI,GAAG,MAAM,2BAA2B,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACvE,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE;gBACxB,KAAK,IAAI,CAAC,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;oBAClD,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM;wBAAE,OAAO,CAAC,CAAC;gBAChD,CAAC;gBACD,OAAO,CAAC,CAAC,CAAC;YACZ,CAAC,CAAC,EAAE,CAAC;YACL,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;gBACrB,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;gBAIzC,YAAY,GAAG;oBACb,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC;oBACrC;wBACE,GAAG,MAAM;wBACT,OAAO,EAAE;4BACP,GAAG,MAAM,CAAC,OAAO;4BACjB,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,kBAAkB,EAAE;4BACnD,EAAE,IAAI,EAAE,WAAoB,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE;yBACjE;qBACF;oBACD,GAAG,YAAY,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC;iBACvC,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAkB;QAC/B,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE;QACrF,GAAG,aAAa;QAChB,GAAG,gBAAgB;QACnB,GAAG,YAAY;KAChB,CAAC;IAKF,MAAM,mBAAmB,GACvB,UAAU,IAAI,cAAc,CAAC,CAAC,CAAE,cAAc,CAAC,QAAiE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/H,MAAM,QAAQ,GAAG,WAAW;QAC1B,CAAC,CAAC,MAAM,sBAAsB,CAAC,IAAI,EAAE;YACjC,QAAQ,EAAE,SAAS;YACnB,KAAK,EAAE,mBAAmB;YAC1B,mBAAmB,EAAE,cAAc;SACpC,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO,MAAM,CAAC,EAAE,CAAC;QACf,KAAK;QACL,QAAQ;QACR,YAAY,EAAE,KAAK;KACpB,CAAC,CAAC;AACL,CAAC;AAuBD,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,IAAoB,EACpB,IAAkH;IAElH,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC;IACtC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;SAC1B,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;SAChC,IAAI,CAAC,CAAC,CAAC;SACP,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SACvG,KAAK,CAAC,CAAC,CAAC;SACR,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACrB,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO;IAE9B,MAAM,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAkB,EAAE,WAAW,CAAC,CAAC;IAC3F,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,KAAK,CAAC;IACnE,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC;QAAE,OAAO;IAEvD,MAAM,IAAI,GAAkB;QAC1B,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;QACnD,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAA+B,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAC1G,CAAC;IACF,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;SACd,MAAM,CAAC,CAAC,CAAC;SACT,GAAG,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;SAC1D,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAC7G,CAAC"}
|
|
1
|
+
{"version":3,"file":"prompt-assembly.js","sourceRoot":"","sources":["../../jsr/intern/prompt-assembly.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vibes.diy/api-svc",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.5.5",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -18,20 +18,18 @@
|
|
|
18
18
|
"@libsql/client": "~0.17.4",
|
|
19
19
|
"@neondatabase/serverless": "~1.1.0",
|
|
20
20
|
"@noble/hashes": "~2.2.0",
|
|
21
|
-
"@vibes.diy/api-
|
|
22
|
-
"@vibes.diy/api-
|
|
23
|
-
"@vibes.diy/api-
|
|
24
|
-
"@vibes.diy/
|
|
25
|
-
"@vibes.diy/
|
|
26
|
-
"@vibes.diy/
|
|
27
|
-
"@vibes.diy/
|
|
28
|
-
"@vibes.diy/
|
|
29
|
-
"@vibes.diy/vibe-
|
|
30
|
-
"@vibes.diy/vibe-runtime": "4.4.5",
|
|
31
|
-
"@vibes.diy/vibe-types": "4.4.5",
|
|
21
|
+
"@vibes.diy/api-pkg": "4.5.5",
|
|
22
|
+
"@vibes.diy/api-sql": "4.5.5",
|
|
23
|
+
"@vibes.diy/api-types": "4.5.5",
|
|
24
|
+
"@vibes.diy/call-ai-v2": "4.5.5",
|
|
25
|
+
"@vibes.diy/identity": "4.5.5",
|
|
26
|
+
"@vibes.diy/prompts": "4.5.5",
|
|
27
|
+
"@vibes.diy/vibe-db-explorer": "4.5.5",
|
|
28
|
+
"@vibes.diy/vibe-runtime": "4.5.5",
|
|
29
|
+
"@vibes.diy/vibe-types": "4.5.5",
|
|
32
30
|
"acorn": "~8.17.0",
|
|
33
31
|
"arktype": "~2.2.2",
|
|
34
|
-
"call-ai": "4.
|
|
32
|
+
"call-ai": "4.5.5",
|
|
35
33
|
"cookie": "~1.1.1",
|
|
36
34
|
"drizzle-orm": "~0.45.2",
|
|
37
35
|
"jose": "~6.2.2",
|
|
@@ -40,8 +38,7 @@
|
|
|
40
38
|
"random-words": "~2.0.1",
|
|
41
39
|
"react": "~19.2.7",
|
|
42
40
|
"react-dom": "~19.2.7",
|
|
43
|
-
"sucrase": "~3.35.1"
|
|
44
|
-
"ws": "~8.21.0"
|
|
41
|
+
"sucrase": "~3.35.1"
|
|
45
42
|
},
|
|
46
43
|
"repository": {
|
|
47
44
|
"type": "git",
|
|
@@ -46,46 +46,104 @@ export function makeHelpers(user, grantState) {
|
|
|
46
46
|
};
|
|
47
47
|
}
|
|
48
48
|
export function extractExportSource(fullSource, bindingDbName) {
|
|
49
|
+
const target = findTargetSpan(fullSource, bindingDbName);
|
|
50
|
+
if (target === undefined)
|
|
51
|
+
return undefined;
|
|
52
|
+
let extracted = fullSource.slice(target.start, target.end).replace(/^export\s+/, "");
|
|
53
|
+
if (target.isDefault)
|
|
54
|
+
extracted = extracted.replace(/^default\s+/, "");
|
|
55
|
+
if (extracted === "")
|
|
56
|
+
return extracted;
|
|
57
|
+
const preamble = moduleScopePreamble(fullSource, target);
|
|
58
|
+
return preamble === "" ? extracted : `${extracted}\n;\n${preamble}`;
|
|
59
|
+
}
|
|
60
|
+
const DEFAULT_EXPORT_PATTERN = /export\s+default\s+(?:function\s*(?:\w+\s*)?\([^)]*\)\s*\{|\([^)]*\)\s*=>\s*\{|\w+\s*=>\s*\{)/;
|
|
61
|
+
function findTargetSpan(fullSource, bindingDbName) {
|
|
49
62
|
if (bindingDbName === "*") {
|
|
50
|
-
|
|
63
|
+
const span = matchBraceSpan(fullSource, DEFAULT_EXPORT_PATTERN);
|
|
64
|
+
return span === undefined ? undefined : { ...span, isDefault: true };
|
|
51
65
|
}
|
|
52
66
|
const directPattern = new RegExp(`export\\s+function\\s+${escapeRegExp(bindingDbName)}\\s*\\([^)]*\\)\\s*\\{`);
|
|
53
|
-
const direct =
|
|
54
|
-
if (direct)
|
|
55
|
-
return direct;
|
|
67
|
+
const direct = matchBraceSpan(fullSource, directPattern);
|
|
68
|
+
if (direct !== undefined && direct.end > direct.start)
|
|
69
|
+
return { ...direct, isDefault: false };
|
|
56
70
|
const asMatch = fullSource.match(new RegExp(`export\\s*\\{\\s*(\\w+)\\s+as\\s+["']${escapeRegExp(bindingDbName)}["']\\s*\\}`));
|
|
57
71
|
if (asMatch) {
|
|
58
72
|
const localName = asMatch[1];
|
|
59
73
|
const fnPattern = new RegExp(`function\\s+${localName}\\s*\\([^)]*\\)\\s*\\{`);
|
|
60
|
-
|
|
74
|
+
const local = matchBraceSpan(fullSource, fnPattern);
|
|
75
|
+
if (local !== undefined)
|
|
76
|
+
return { ...local, isDefault: false };
|
|
61
77
|
}
|
|
62
78
|
return undefined;
|
|
63
79
|
}
|
|
64
80
|
function escapeRegExp(s) {
|
|
65
81
|
return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
66
82
|
}
|
|
67
|
-
function
|
|
83
|
+
function matchBraceSpan(fullSource, pattern) {
|
|
68
84
|
const match = fullSource.match(pattern);
|
|
69
85
|
if (!match || match.index === undefined)
|
|
70
86
|
return undefined;
|
|
71
87
|
const start = match.index;
|
|
72
88
|
let depth = 0;
|
|
73
|
-
let end = start;
|
|
74
89
|
for (let i = start; i < fullSource.length; i++) {
|
|
75
90
|
if (fullSource[i] === "{")
|
|
76
91
|
depth++;
|
|
77
92
|
if (fullSource[i] === "}") {
|
|
78
93
|
depth--;
|
|
79
|
-
if (depth === 0)
|
|
80
|
-
end
|
|
81
|
-
break;
|
|
82
|
-
}
|
|
94
|
+
if (depth === 0)
|
|
95
|
+
return { start, end: i + 1 };
|
|
83
96
|
}
|
|
84
97
|
}
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
98
|
+
return { start, end: start };
|
|
99
|
+
}
|
|
100
|
+
function moduleScopePreamble(fullSource, target) {
|
|
101
|
+
const cut = [{ start: target.start, end: target.end }];
|
|
102
|
+
const importStatement = /^[ \t]*import\b[\s\S]*?["'][^"'\n]*["'][ \t]*;?/gm;
|
|
103
|
+
const exportList = /^[ \t]*export\s*\{[^}]*\}(?:\s*from\s*["'][^"'\n]*["'])?[ \t]*;?/gm;
|
|
104
|
+
const exportStar = /^[ \t]*export\s*\*(?:\s*as\s+[A-Za-z_$][\w$]*)?\s*from\s*["'][^"'\n]*["'][ \t]*;?/gm;
|
|
105
|
+
for (const pattern of [importStatement, exportList, exportStar]) {
|
|
106
|
+
for (let m = pattern.exec(fullSource); m !== null; m = pattern.exec(fullSource)) {
|
|
107
|
+
cut.push({ start: m.index, end: m.index + m[0].length });
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
if (!target.isDefault) {
|
|
111
|
+
const defaultKeyword = /^[ \t]*export\s+default\b/gm;
|
|
112
|
+
for (let m = defaultKeyword.exec(fullSource); m !== null; m = defaultKeyword.exec(fullSource)) {
|
|
113
|
+
cut.push({ start: m.index, end: defaultStatementEnd(fullSource, m.index + m[0].length) });
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
cut.sort((a, b) => a.start - b.start);
|
|
117
|
+
let rest = "";
|
|
118
|
+
let pos = 0;
|
|
119
|
+
for (const span of cut) {
|
|
120
|
+
if (span.start > pos)
|
|
121
|
+
rest += fullSource.slice(pos, span.start);
|
|
122
|
+
if (span.end > pos)
|
|
123
|
+
pos = span.end;
|
|
124
|
+
}
|
|
125
|
+
rest += fullSource.slice(pos);
|
|
126
|
+
return rest.replace(/(^|\n)([ \t]*)export\s+(?=async\b|function\b|const\b|let\b|var\b|class\b)/g, "$1$2").trim();
|
|
127
|
+
}
|
|
128
|
+
function defaultStatementEnd(fullSource, from) {
|
|
129
|
+
let depth = 0;
|
|
130
|
+
let hasContent = false;
|
|
131
|
+
for (let i = from; i < fullSource.length; i++) {
|
|
132
|
+
const ch = fullSource[i];
|
|
133
|
+
if (ch === "{" || ch === "(" || ch === "[")
|
|
134
|
+
depth++;
|
|
135
|
+
else if (ch === "}" || ch === ")" || ch === "]")
|
|
136
|
+
depth--;
|
|
137
|
+
if (depth === 0) {
|
|
138
|
+
if (ch === ";")
|
|
139
|
+
return i + 1;
|
|
140
|
+
if (ch === "\n" && hasContent)
|
|
141
|
+
return i;
|
|
142
|
+
}
|
|
143
|
+
if (!/\s/.test(ch))
|
|
144
|
+
hasContent = true;
|
|
145
|
+
}
|
|
146
|
+
return fullSource.length;
|
|
89
147
|
}
|
|
90
148
|
export class ForbiddenError extends Error {
|
|
91
149
|
forbidden;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-function.js","sourceRoot":"","sources":["../../jsr/public/access-function.ts"],"names":[],"mappings":"AA4BA,MAAM,UAAU,qBAAqB,CAAC,MAAwB,EAAE,IAAwB;IACtF,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QAC5C,MAAM,IAAI,cAAc,CAAC,yBAAyB,CAAC,CAAC;IACtD,CAAC;AACH,CAAC;AAYD,MAAM,UAAU,gBAAgB,CAAC,MAAwB;IACvD,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;AACtE,CAAC;AAQD,MAAM,UAAU,WAAW,CAAC,IAAwB,EAAE,UAAuB;IAC3E,MAAM,EAAE,GAAe,UAAU,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;IAErF,SAAS,eAAe,CAAC,UAAkB;QACzC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;QACnC,MAAM,MAAM,GAAG,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACzC,IAAI,MAAM;YAAE,KAAK,MAAM,EAAE,IAAI,MAAM;gBAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACtD,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;YACzD,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBACjC,MAAM,YAAY,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACzC,IAAI,YAAY;oBAAE,KAAK,MAAM,EAAE,IAAI,YAAY;wBAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,OAAO;QACL,aAAa,CAAC,SAAiB;YAC7B,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAClB,MAAM,IAAI,cAAc,CAAC,mBAAmB,SAAS,EAAE,CAAC,CAAC;YAC3D,CAAC;YACD,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAClD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC7B,MAAM,IAAI,cAAc,CAAC,mBAAmB,SAAS,EAAE,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QACD,WAAW,CAAC,QAAgB;YAC1B,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAClB,MAAM,IAAI,cAAc,CAAC,gBAAgB,QAAQ,EAAE,CAAC,CAAC;YACvD,CAAC;YACD,MAAM,WAAW,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACzC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC5C,MAAM,IAAI,cAAc,CAAC,gBAAgB,QAAQ,EAAE,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"access-function.js","sourceRoot":"","sources":["../../jsr/public/access-function.ts"],"names":[],"mappings":"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"}
|
package/public/access-helpers.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { eq } from "drizzle-orm";
|
|
2
|
-
import { isResHasAccessInviteAccepted, isResHasAccessRequestApproved, isResHasAccessRequestNotFound, } from "@vibes.diy/api-types";
|
|
2
|
+
import { isDirectChannel, isResHasAccessInviteAccepted, isResHasAccessRequestApproved, isResHasAccessRequestNotFound, } from "@vibes.diy/api-types";
|
|
3
3
|
import { hasAccessInvite } from "./invite-flow.js";
|
|
4
4
|
import { hasAccessRequest } from "./request-flow.js";
|
|
5
|
+
import { adminUserIdSet } from "./app-settings-suggestion-bless.js";
|
|
5
6
|
import { ensureAppSettings } from "./ensure-app-settings.js";
|
|
6
7
|
export { canRead, canWrite } from "@vibes.diy/vibe-types";
|
|
7
8
|
export async function checkDocAccess(vctx, userId, appSlug, ownerHandle, adminMode) {
|
|
@@ -13,6 +14,9 @@ export async function checkDocAccess(vctx, userId, appSlug, ownerHandle, adminMo
|
|
|
13
14
|
.then((r) => r[0]);
|
|
14
15
|
if (binding?.userId === userId)
|
|
15
16
|
return { access: adminMode ? "override" : "editor", isOwner: true };
|
|
17
|
+
if (adminMode === true && !isDirectChannel(ownerHandle) && adminUserIdSet(vctx).has(userId)) {
|
|
18
|
+
return { access: "override", isOwner: true };
|
|
19
|
+
}
|
|
16
20
|
const rInvite = await hasAccessInvite(vctx, { grantUserId: userId, appSlug, ownerHandle });
|
|
17
21
|
if (rInvite.isOk()) {
|
|
18
22
|
const invite = rInvite.Ok();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-helpers.js","sourceRoot":"","sources":["../../jsr/public/access-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAEL,4BAA4B,EAC5B,6BAA6B,EAC7B,6BAA6B,GAC9B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAO7D,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAE1D,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,IAAoB,EACpB,MAAc,EACd,OAAe,EACf,WAAmB,EACnB,SAAmB;IAEnB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;SAC9B,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;SACxD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;SACnC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;SAC5D,KAAK,CAAC,CAAC,CAAC;SACR,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAErB,IAAI,OAAO,EAAE,MAAM,KAAK,MAAM;QAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"access-helpers.js","sourceRoot":"","sources":["../../jsr/public/access-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { VibesApiSQLCtx } from "../types.js";
|
|
2
|
+
export interface DocChangedFanOutParams {
|
|
3
|
+
ownerHandle: string;
|
|
4
|
+
appSlug: string;
|
|
5
|
+
dbName: string;
|
|
6
|
+
docId: string;
|
|
7
|
+
channels: string[];
|
|
8
|
+
senderConnId: string;
|
|
9
|
+
}
|
|
10
|
+
export declare function notifyDocChangedFanOut(vctx: VibesApiSQLCtx, p: DocChangedFanOutParams): void;
|
|
11
|
+
export interface ViewerGrantsChangedFanOutParams {
|
|
12
|
+
ownerHandle: string;
|
|
13
|
+
appSlug: string;
|
|
14
|
+
senderConnId: string;
|
|
15
|
+
}
|
|
16
|
+
export declare function notifyViewerGrantsChangedFanOut(vctx: VibesApiSQLCtx, p: ViewerGrantsChangedFanOutParams): void;
|
|
17
|
+
export interface DmWriteEffectsParams {
|
|
18
|
+
ownerHandle: string;
|
|
19
|
+
docId: string;
|
|
20
|
+
userId: string | null;
|
|
21
|
+
nextSeq: number;
|
|
22
|
+
now: string;
|
|
23
|
+
doc: Record<string, unknown>;
|
|
24
|
+
}
|
|
25
|
+
export declare function emitDmWriteEffects(vctx: VibesApiSQLCtx, p: DmWriteEffectsParams): Promise<void>;
|
|
26
|
+
export interface CommentPostedEventParams {
|
|
27
|
+
ownerHandle: string;
|
|
28
|
+
appSlug: string;
|
|
29
|
+
dbName: string;
|
|
30
|
+
docId: string;
|
|
31
|
+
userId: string | null;
|
|
32
|
+
email: string | undefined;
|
|
33
|
+
nextSeq: number;
|
|
34
|
+
now: string;
|
|
35
|
+
}
|
|
36
|
+
export declare function emitCommentPostedEvent(vctx: VibesApiSQLCtx, p: CommentPostedEventParams): Promise<void>;
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { COMMENTS_DB_NAME, isDirectChannel, directChannelParticipants, } from "@vibes.diy/api-types";
|
|
2
|
+
import { eq, and, sql, inArray } from "drizzle-orm";
|
|
3
|
+
export function notifyDocChangedFanOut(vctx, p) {
|
|
4
|
+
if (!vctx.notifyDocChanged)
|
|
5
|
+
return;
|
|
6
|
+
if (p.channels.length) {
|
|
7
|
+
for (const channel of p.channels) {
|
|
8
|
+
vctx
|
|
9
|
+
.notifyDocChanged({ ownerHandle: p.ownerHandle, appSlug: p.appSlug, dbName: p.dbName, docId: p.docId, channel }, p.senderConnId)
|
|
10
|
+
.catch((e) => console.error("doc-changed channel fan-out error:", e));
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
else {
|
|
14
|
+
vctx
|
|
15
|
+
.notifyDocChanged({ ownerHandle: p.ownerHandle, appSlug: p.appSlug, dbName: p.dbName, docId: p.docId }, p.senderConnId)
|
|
16
|
+
.catch((e) => console.error("doc-changed fan-out error:", e));
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
export function notifyViewerGrantsChangedFanOut(vctx, p) {
|
|
20
|
+
if (!vctx.notifyViewerGrantsChanged)
|
|
21
|
+
return;
|
|
22
|
+
vctx
|
|
23
|
+
.notifyViewerGrantsChanged({
|
|
24
|
+
type: "vibes.diy.evt-viewer-grants-changed",
|
|
25
|
+
ownerHandle: p.ownerHandle,
|
|
26
|
+
appSlug: p.appSlug,
|
|
27
|
+
}, p.senderConnId)
|
|
28
|
+
.catch((e) => console.error("Viewer grants notify error:", e));
|
|
29
|
+
}
|
|
30
|
+
export async function emitDmWriteEffects(vctx, p) {
|
|
31
|
+
const { ownerHandle, docId, userId, nextSeq, now, doc } = p;
|
|
32
|
+
if (!isDirectChannel(ownerHandle))
|
|
33
|
+
return;
|
|
34
|
+
const participants = directChannelParticipants(ownerHandle);
|
|
35
|
+
if (!participants)
|
|
36
|
+
return;
|
|
37
|
+
const t_idx = vctx.sql.tables.directChannelIndex;
|
|
38
|
+
await vctx.sql.db
|
|
39
|
+
.insert(t_idx)
|
|
40
|
+
.values([
|
|
41
|
+
{ handle: participants[0], channelHandle: ownerHandle },
|
|
42
|
+
{ handle: participants[1], channelHandle: ownerHandle },
|
|
43
|
+
])
|
|
44
|
+
.onConflictDoNothing();
|
|
45
|
+
const t_usb = vctx.sql.tables.handleBinding;
|
|
46
|
+
const senderRow = await vctx.sql.db
|
|
47
|
+
.select({ handle: t_usb.handle })
|
|
48
|
+
.from(t_usb)
|
|
49
|
+
.where(and(eq(t_usb.userId, userId ?? ""), inArray(t_usb.handle, participants)))
|
|
50
|
+
.then((r) => r[0]);
|
|
51
|
+
const senderUserSlug = senderRow?.handle ?? "";
|
|
52
|
+
const recipientUserSlug = participants.find((h) => h !== senderUserSlug) ?? participants[1];
|
|
53
|
+
await vctx.postQueue({
|
|
54
|
+
payload: {
|
|
55
|
+
type: "vibes.diy.evt-dm-received",
|
|
56
|
+
senderUserId: userId ?? "",
|
|
57
|
+
senderUserSlug,
|
|
58
|
+
recipientUserSlug,
|
|
59
|
+
channelUserSlug: ownerHandle,
|
|
60
|
+
docId,
|
|
61
|
+
created: now,
|
|
62
|
+
bodySnippet: typeof doc.body === "string" ? doc.body.slice(0, 100) : undefined,
|
|
63
|
+
},
|
|
64
|
+
tid: "queue-event",
|
|
65
|
+
src: "putDoc",
|
|
66
|
+
dst: "vibes-service",
|
|
67
|
+
ttl: 1,
|
|
68
|
+
});
|
|
69
|
+
if (senderUserSlug) {
|
|
70
|
+
const t_reads = vctx.sql.tables.directChannelReads;
|
|
71
|
+
await vctx.sql.db
|
|
72
|
+
.insert(t_reads)
|
|
73
|
+
.values({ channelHandle: ownerHandle, handle: senderUserSlug, lastSeenSeq: nextSeq })
|
|
74
|
+
.onConflictDoUpdate({
|
|
75
|
+
target: [t_reads.channelHandle, t_reads.handle],
|
|
76
|
+
set: { lastSeenSeq: sql `MAX(${t_reads.lastSeenSeq}, ${nextSeq})` },
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
export async function emitCommentPostedEvent(vctx, p) {
|
|
81
|
+
if (p.dbName !== COMMENTS_DB_NAME || p.nextSeq !== 1)
|
|
82
|
+
return;
|
|
83
|
+
await vctx.postQueue({
|
|
84
|
+
payload: {
|
|
85
|
+
type: "vibes.diy.evt-comment-posted",
|
|
86
|
+
userId: p.userId ?? "unknown",
|
|
87
|
+
ownerHandle: p.ownerHandle,
|
|
88
|
+
appSlug: p.appSlug,
|
|
89
|
+
docId: p.docId,
|
|
90
|
+
created: p.now,
|
|
91
|
+
email: p.email ?? "unknown",
|
|
92
|
+
},
|
|
93
|
+
tid: "queue-event",
|
|
94
|
+
src: "putDoc",
|
|
95
|
+
dst: "vibes-service",
|
|
96
|
+
ttl: 1,
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
//# sourceMappingURL=app-documents-broadcast.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"app-documents-broadcast.js","sourceRoot":"","sources":["../../jsr/public/app-documents-broadcast.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { VibesApiSQLCtx } from "../types.js";
|
|
2
|
+
import type { AccessDescriptor } from "./access-function.js";
|
|
3
|
+
import { GrantReduce } from "./grant-reduce.js";
|
|
4
|
+
export interface ViewerGrantDeltaParams {
|
|
5
|
+
ownerHandle: string;
|
|
6
|
+
appSlug: string;
|
|
7
|
+
docId: string;
|
|
8
|
+
descriptor: AccessDescriptor;
|
|
9
|
+
outputHasGrants: number;
|
|
10
|
+
grantsReduceBefore: GrantReduce;
|
|
11
|
+
senderConnId: string;
|
|
12
|
+
}
|
|
13
|
+
export declare function notifyViewerGrantDeltaIfChanged(vctx: VibesApiSQLCtx, p: ViewerGrantDeltaParams): void;
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import { extractContribution, newSeededReduce } from "./grant-reduce.js";
|
|
2
|
+
import { notifyViewerGrantsChangedFanOut } from "./app-documents-broadcast.js";
|
|
3
|
+
function grantsUsers(reduce) {
|
|
4
|
+
const users = new Set();
|
|
5
|
+
for (const userSlug of reduce.userGrants.keys()) {
|
|
6
|
+
users.add(userSlug);
|
|
7
|
+
}
|
|
8
|
+
for (const members of reduce.effectiveMembers.values()) {
|
|
9
|
+
for (const userSlug of members) {
|
|
10
|
+
users.add(userSlug);
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
return users;
|
|
14
|
+
}
|
|
15
|
+
function rolesForUser(reduce, userSlug) {
|
|
16
|
+
const roles = [];
|
|
17
|
+
for (const [roleName, members] of reduce.effectiveMembers) {
|
|
18
|
+
if (members.has(userSlug)) {
|
|
19
|
+
roles.push(roleName);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
return roles.sort();
|
|
23
|
+
}
|
|
24
|
+
function channelsForUser(reduce, userSlug) {
|
|
25
|
+
return Array.from(reduce.resolveEffectiveChannels(userSlug)).sort();
|
|
26
|
+
}
|
|
27
|
+
function arraysEqual(a, b) {
|
|
28
|
+
if (a.length !== b.length)
|
|
29
|
+
return false;
|
|
30
|
+
for (let i = 0; i < a.length; i++) {
|
|
31
|
+
if (a[i] !== b[i])
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
34
|
+
return true;
|
|
35
|
+
}
|
|
36
|
+
function hasEffectiveViewerGrantDelta(before, after) {
|
|
37
|
+
const beforePublic = Array.from(before.publicChannels).sort();
|
|
38
|
+
const afterPublic = Array.from(after.publicChannels).sort();
|
|
39
|
+
if (!arraysEqual(beforePublic, afterPublic)) {
|
|
40
|
+
return true;
|
|
41
|
+
}
|
|
42
|
+
const users = new Set([...grantsUsers(before), ...grantsUsers(after)]);
|
|
43
|
+
for (const userSlug of users) {
|
|
44
|
+
const beforeChannels = channelsForUser(before, userSlug);
|
|
45
|
+
const afterChannels = channelsForUser(after, userSlug);
|
|
46
|
+
if (!arraysEqual(beforeChannels, afterChannels)) {
|
|
47
|
+
return true;
|
|
48
|
+
}
|
|
49
|
+
const beforeRoles = rolesForUser(before, userSlug);
|
|
50
|
+
const afterRoles = rolesForUser(after, userSlug);
|
|
51
|
+
if (!arraysEqual(beforeRoles, afterRoles)) {
|
|
52
|
+
return true;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return false;
|
|
56
|
+
}
|
|
57
|
+
export function notifyViewerGrantDeltaIfChanged(vctx, p) {
|
|
58
|
+
const grantsReduceAfter = newSeededReduce(p.ownerHandle);
|
|
59
|
+
for (const [storedDocId, contribution] of p.grantsReduceBefore.docContributions) {
|
|
60
|
+
grantsReduceAfter.addDoc(storedDocId, contribution);
|
|
61
|
+
}
|
|
62
|
+
if (p.outputHasGrants === 1) {
|
|
63
|
+
grantsReduceAfter.addDoc(p.docId, extractContribution(p.descriptor));
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
grantsReduceAfter.removeDoc(p.docId);
|
|
67
|
+
}
|
|
68
|
+
if (hasEffectiveViewerGrantDelta(p.grantsReduceBefore, grantsReduceAfter)) {
|
|
69
|
+
notifyViewerGrantsChangedFanOut(vctx, {
|
|
70
|
+
ownerHandle: p.ownerHandle,
|
|
71
|
+
appSlug: p.appSlug,
|
|
72
|
+
senderConnId: p.senderConnId,
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
//# sourceMappingURL=app-documents-grant-delta.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"app-documents-grant-delta.js","sourceRoot":"","sources":["../../jsr/public/app-documents-grant-delta.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { VibesApiSQLCtx } from "../types.js";
|
|
2
|
+
import type { AccessDescriptor } from "./access-function.js";
|
|
3
|
+
export interface PersistPutRevisionParams {
|
|
4
|
+
ownerHandle: string;
|
|
5
|
+
appSlug: string;
|
|
6
|
+
dbName: string;
|
|
7
|
+
docId: string;
|
|
8
|
+
doc: Record<string, unknown>;
|
|
9
|
+
userId: string | null;
|
|
10
|
+
now: string;
|
|
11
|
+
accessResult: AccessDescriptor | undefined;
|
|
12
|
+
accessFnCid: string | undefined;
|
|
13
|
+
mightNoop: boolean;
|
|
14
|
+
}
|
|
15
|
+
export interface StoredAccessOutput {
|
|
16
|
+
descriptor: AccessDescriptor;
|
|
17
|
+
outputHasGrants: number;
|
|
18
|
+
}
|
|
19
|
+
export interface PersistPutRevisionResult {
|
|
20
|
+
alloc: {
|
|
21
|
+
seq: number;
|
|
22
|
+
inserted: boolean;
|
|
23
|
+
};
|
|
24
|
+
storeAccessOutput: StoredAccessOutput | undefined;
|
|
25
|
+
grantUpsertErr: Error | undefined;
|
|
26
|
+
noopRefreshedStaleOutput: boolean;
|
|
27
|
+
}
|
|
28
|
+
export declare function persistPutRevision(vctx: VibesApiSQLCtx, p: PersistPutRevisionParams): Promise<PersistPutRevisionResult>;
|