@superblocksteam/sdk 2.0.99 → 2.0.100-next.1
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/.turbo/turbo-build.log +1 -1
- package/dist/cli-replacement/dev.d.mts.map +1 -1
- package/dist/cli-replacement/dev.mjs +64 -20
- package/dist/cli-replacement/dev.mjs.map +1 -1
- package/dist/cli-replacement/init.d.ts.map +1 -1
- package/dist/cli-replacement/init.js +1 -0
- package/dist/cli-replacement/init.js.map +1 -1
- package/dist/client.d.ts +8 -21
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +36 -5
- package/dist/client.js.map +1 -1
- package/dist/collect-sdk-apis.d.mts +10 -6
- package/dist/collect-sdk-apis.d.mts.map +1 -1
- package/dist/collect-sdk-apis.mjs +20 -5
- package/dist/collect-sdk-apis.mjs.map +1 -1
- package/dist/collect-sdk-apis.test.mjs +53 -4
- package/dist/collect-sdk-apis.test.mjs.map +1 -1
- package/dist/dbfs/client.d.ts +2 -0
- package/dist/dbfs/client.d.ts.map +1 -1
- package/dist/dbfs/client.js +43 -17
- package/dist/dbfs/client.js.map +1 -1
- package/dist/dbfs/client.test.d.ts +2 -0
- package/dist/dbfs/client.test.d.ts.map +1 -0
- package/dist/dbfs/client.test.js +81 -0
- package/dist/dbfs/client.test.js.map +1 -0
- package/dist/extract-api-integrations.d.mts +17 -0
- package/dist/extract-api-integrations.d.mts.map +1 -0
- package/dist/extract-api-integrations.mjs +233 -0
- package/dist/extract-api-integrations.mjs.map +1 -0
- package/dist/extract-api-integrations.test.d.mts +2 -0
- package/dist/extract-api-integrations.test.d.mts.map +1 -0
- package/dist/extract-api-integrations.test.mjs +97 -0
- package/dist/extract-api-integrations.test.mjs.map +1 -0
- package/dist/sdk.d.ts +13 -6
- package/dist/sdk.d.ts.map +1 -1
- package/dist/sdk.js +13 -6
- package/dist/sdk.js.map +1 -1
- package/dist/sdk.test.d.ts +2 -0
- package/dist/sdk.test.d.ts.map +1 -0
- package/dist/sdk.test.js +71 -0
- package/dist/sdk.test.js.map +1 -0
- package/dist/telemetry/index.d.ts.map +1 -1
- package/dist/telemetry/index.js +9 -2
- package/dist/telemetry/index.js.map +1 -1
- package/dist/telemetry/logging.d.ts.map +1 -1
- package/dist/telemetry/logging.js +1 -0
- package/dist/telemetry/logging.js.map +1 -1
- package/dist/version-control.d.mts +5 -3
- package/dist/version-control.d.mts.map +1 -1
- package/dist/version-control.mjs +18 -10
- package/dist/version-control.mjs.map +1 -1
- package/dist/vite-plugin-generate-api-build-manifest.d.mts.map +1 -1
- package/dist/vite-plugin-generate-api-build-manifest.mjs.map +1 -1
- package/package.json +6 -6
- package/src/cli-replacement/dev.mts +73 -24
- package/src/cli-replacement/init.ts +1 -0
- package/src/client.ts +53 -22
- package/src/collect-sdk-apis.mts +30 -6
- package/src/collect-sdk-apis.test.mts +58 -4
- package/src/dbfs/client.test.ts +116 -0
- package/src/dbfs/client.ts +60 -21
- package/src/extract-api-integrations.mts +345 -0
- package/src/extract-api-integrations.test.mts +114 -0
- package/src/sdk.test.ts +106 -0
- package/src/sdk.ts +40 -3
- package/src/telemetry/index.ts +13 -2
- package/src/telemetry/logging.ts +1 -0
- package/src/version-control.mts +23 -8
- package/src/vite-plugin-generate-api-build-manifest.mts +7 -1
- package/test/version-control.test.mts +81 -1
- package/tsconfig.tsbuildinfo +1 -1
package/dist/telemetry/index.js
CHANGED
|
@@ -5,8 +5,6 @@ import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
|
|
|
5
5
|
import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
|
|
6
6
|
import { DeploymentTypeEnum, OBS_TAG_APPLICATION_ID, OBS_TAG_BRANCH, OBS_TAG_ORG_ID, OBS_TAG_USER_EMAIL, } from "@superblocksteam/shared";
|
|
7
7
|
import { initNodeTelemetry, getTelemetryInstance, isTelemetryInitialized, parseDeploymentType, resetTelemetry, getDefaultPolicy, } from "@superblocksteam/telemetry";
|
|
8
|
-
// Note: dd-trace kept for LLMObs until Epic 07 completes
|
|
9
|
-
import ddTrace from "dd-trace";
|
|
10
8
|
import packageJson from "../../package.json" with { type: "json" };
|
|
11
9
|
import { ATTR_SUPERBLOCKS_BASE_URL, ATTR_SUPERBLOCKS_CLI_TOKEN, ATTR_SUPERBLOCKS_CSB_ID, ATTR_SUPERBLOCKS_IS_CSB, ATTR_SUPERBLOCKS_USER_ID, getEnvironmentFromHostname, } from "./attributes.js";
|
|
12
10
|
import { applyLocalObsEnvVars, isLocalObsEnabled } from "./local-obs.js";
|
|
@@ -17,6 +15,14 @@ applyLocalObsEnvVars();
|
|
|
17
15
|
// Configuration state
|
|
18
16
|
let config = undefined;
|
|
19
17
|
let configured = false;
|
|
18
|
+
// Load dd-trace only when telemetry is explicitly configured. This keeps
|
|
19
|
+
// lightweight SDK consumers from pulling in dd-trace as a module-load side
|
|
20
|
+
// effect when they only need logger/tracer helpers.
|
|
21
|
+
let ddTracePromise = undefined;
|
|
22
|
+
async function getDdTrace() {
|
|
23
|
+
ddTracePromise ??= import("dd-trace").then((module) => module.default);
|
|
24
|
+
return await ddTracePromise;
|
|
25
|
+
}
|
|
20
26
|
/**
|
|
21
27
|
* Current deployment type based on SUPERBLOCKS_DEPLOYMENT_TYPE env var.
|
|
22
28
|
* Defaults to CLOUD if not specified or invalid.
|
|
@@ -82,6 +88,7 @@ export async function configureTelemetry(applicationConfig) {
|
|
|
82
88
|
// NOTE: @joeyagreco - we do this because (per DataDog support):
|
|
83
89
|
// NOTE: @joeyagreco - "There is currently no way to define a retention filter directly for "LLM apps" unless those apps are associated with a specific service tag."
|
|
84
90
|
const SERVICE_NAME_LLM = "superblocks-ai-code-gen";
|
|
91
|
+
const ddTrace = await getDdTrace();
|
|
85
92
|
ddTrace.init({
|
|
86
93
|
env: getEnvironmentFromHostname(config.superblocksHostname),
|
|
87
94
|
service: SERVICE_NAME_LLM,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,KAAK,EAAe,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,IAAI,EAAe,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,cAAc,EACd,cAAc,EACd,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,sBAAsB,EACtB,mBAAmB,EACnB,cAAc,EACd,gBAAgB,GACjB,MAAM,4BAA4B,CAAC;AACpC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/telemetry/logging.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/telemetry/logging.ts"],"names":[],"mappings":"AA+CA,UAAU,SAAS;IACjB,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACxC,IAAI,EAAE,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACvC,IAAI,EAAE,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACvC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS,KAAK,IAAI,CAAC;CACpD;AAiDD,wBAAgB,SAAS,CACvB,cAAc,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,GAChD,MAAM,CAWR;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAgBtD"}
|
|
@@ -4,6 +4,7 @@ import { safeStringify } from "./safe-stringify.js";
|
|
|
4
4
|
import { getLogger as getTracedLogger } from "./index.js";
|
|
5
5
|
const activeTransports = [];
|
|
6
6
|
if (process.env.SUPERBLOCKS_IS_CSB === "true") {
|
|
7
|
+
// TODO(alex): Revisit this for cloud-prem if we want logger to write to stdout
|
|
7
8
|
activeTransports.push(new transports.File({
|
|
8
9
|
format: format.json(),
|
|
9
10
|
filename: `/tmp/dev-server.log`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/telemetry/logging.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/telemetry/logging.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { ExportViewMode } from "@superblocksteam/shared";
|
|
1
|
+
import { DEFAULT_BRANCH, ExportViewMode } from "@superblocksteam/shared";
|
|
2
2
|
import type { ApplicationWrapper, MultiPageApplicationWrapper, MultiPageApplicationWrapperWithComponents, CodeModeApplicationWrapper } from "./client.js";
|
|
3
3
|
import type { FeatureFlags } from "./flag.js";
|
|
4
4
|
import type { SuperblocksSdk } from "./sdk.js";
|
|
5
5
|
import type { LocalGitRepoState, SuperblocksMonorepoConfig, VersionedResourceConfig, ApiInfo, ApiWrapper } from "@superblocksteam/util";
|
|
6
|
+
export { DEFAULT_BRANCH };
|
|
6
7
|
export declare const DRAFT_MODE = "draft";
|
|
7
|
-
export declare const DEFAULT_BRANCH = "main";
|
|
8
8
|
export declare const modeFlagValuesMap: Record<string, string>;
|
|
9
9
|
export declare enum FileStructureType {
|
|
10
10
|
SINGLE_PAGE = "single-page",
|
|
@@ -23,11 +23,13 @@ export declare function readApplicationFromDisk(rootPath: string, existingRelati
|
|
|
23
23
|
export declare function readMultiPageApplicationFromDisk(rootPath: string, existingRelativeLocation: string): Promise<MultiPageApplicationWrapper>;
|
|
24
24
|
export declare function readApiFromDisk(rootPath: string, existingRelativeLocation: string): Promise<ApiWrapper>;
|
|
25
25
|
export declare function writeResourceToDisk(resourceType: string, resourceId: string, resource: any, rootPath: string, featureFlags: FeatureFlags, existingRelativeLocation?: string, preferredApiRepresentation?: ApiRepresentation): Promise<VersionedResourceConfig>;
|
|
26
|
-
export declare function writeApplicationToDisk({ sdk, resource, projectRootFolder, appRelativePath, featureFlags, migrateFromSinglePage, preferredApiRepresentation, }: {
|
|
26
|
+
export declare function writeApplicationToDisk({ sdk, resource, projectRootFolder, appRelativePath, directoryContentsHash, branch, featureFlags, migrateFromSinglePage, preferredApiRepresentation, }: {
|
|
27
27
|
sdk: SuperblocksSdk;
|
|
28
28
|
resource: MultiPageApplicationWrapperWithComponents | CodeModeApplicationWrapper;
|
|
29
29
|
projectRootFolder: string;
|
|
30
30
|
appRelativePath?: string;
|
|
31
|
+
directoryContentsHash?: string;
|
|
32
|
+
branch?: string;
|
|
31
33
|
featureFlags: FeatureFlags;
|
|
32
34
|
migrateFromSinglePage?: boolean;
|
|
33
35
|
preferredApiRepresentation?: ApiRepresentation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-control.d.mts","sourceRoot":"","sources":["../src/version-control.mts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"version-control.d.mts","sourceRoot":"","sources":["../src/version-control.mts"],"names":[],"mappings":"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"}
|
package/dist/version-control.mjs
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as https from "https";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { dirname } from "path";
|
|
4
|
-
import { ExportViewMode } from "@superblocksteam/shared";
|
|
4
|
+
import { DEFAULT_BRANCH, ExportViewMode } from "@superblocksteam/shared";
|
|
5
5
|
import { RESOURCE_CONFIG_PATH, SUPERBLOCKS_HOME_FOLDER_NAME, getSuperblocksApplicationConfigIfExists, getSuperblocksApplicationConfigJson, getSuperblocksBackendConfigIfExists, getSuperblocksApplicationV2ConfigJson, readAppApiYamlFile, writeApiFiles, DEFAULT_LINES_FOR_LARGE_STEPS, } from "@superblocksteam/util";
|
|
6
6
|
import { bold } from "colorette";
|
|
7
7
|
import fs from "fs-extra";
|
|
@@ -11,11 +11,11 @@ import { simpleGit } from "simple-git";
|
|
|
11
11
|
import slugify from "slugify";
|
|
12
12
|
import { parse, stringify as ymlstringify } from "yaml";
|
|
13
13
|
import { getLogger } from "./telemetry/logging.js";
|
|
14
|
+
export { DEFAULT_BRANCH };
|
|
14
15
|
const LATEST_EDITS_MODE = "latest-edits";
|
|
15
16
|
export const DRAFT_MODE = "draft";
|
|
16
17
|
const MOST_RECENT_COMMIT_MODE = "most-recent-commit";
|
|
17
18
|
const DEPLOYED_MODE = "deployed";
|
|
18
|
-
export const DEFAULT_BRANCH = "main";
|
|
19
19
|
export const modeFlagValuesMap = {
|
|
20
20
|
[LATEST_EDITS_MODE]: "Latest edits",
|
|
21
21
|
[DRAFT_MODE]: "Draft",
|
|
@@ -355,7 +355,7 @@ export async function writeResourceToDisk(resourceType, resourceId, resource, ro
|
|
|
355
355
|
}
|
|
356
356
|
// NOTE: If a change is made to how applications are written to disk, please update
|
|
357
357
|
// logic to read applications from disk in the "readMultiPageApplicationFromDisk" function accordingly.
|
|
358
|
-
export async function writeApplicationToDisk({ sdk, resource, projectRootFolder, appRelativePath, featureFlags, migrateFromSinglePage, preferredApiRepresentation, }) {
|
|
358
|
+
export async function writeApplicationToDisk({ sdk, resource, projectRootFolder, appRelativePath, directoryContentsHash, branch, featureFlags, migrateFromSinglePage, preferredApiRepresentation, }) {
|
|
359
359
|
const parentDirName = "apps";
|
|
360
360
|
const newRelativeLocation = `${parentDirName}/${slugifyName(resource.application.name)}`;
|
|
361
361
|
const relativeLocation = appRelativePath ?? newRelativeLocation;
|
|
@@ -364,7 +364,7 @@ export async function writeApplicationToDisk({ sdk, resource, projectRootFolder,
|
|
|
364
364
|
await fs.mkdir(appDirName, { recursive: true });
|
|
365
365
|
}
|
|
366
366
|
if (resource.type === "code-mode") {
|
|
367
|
-
await writeCodeModeApplicationToDisk(sdk, resource, appDirName, featureFlags);
|
|
367
|
+
await writeCodeModeApplicationToDisk(sdk, resource, appDirName, directoryContentsHash, branch, featureFlags);
|
|
368
368
|
return {
|
|
369
369
|
location: relativeLocation,
|
|
370
370
|
resourceType: "APPLICATION",
|
|
@@ -492,7 +492,7 @@ async function writeV1ApplicationToDisk(resource, appDirName, featureFlags, rela
|
|
|
492
492
|
resourceType: "APPLICATION",
|
|
493
493
|
};
|
|
494
494
|
}
|
|
495
|
-
async function writeCodeModeApplicationToDisk(sdk, resource, appDirName, featureFlags) {
|
|
495
|
+
async function writeCodeModeApplicationToDisk(sdk, resource, appDirName, directoryContentsHash, branch, featureFlags) {
|
|
496
496
|
// Find the existing application config and existing file paths
|
|
497
497
|
const existingApplicationConfig = await getSuperblocksApplicationConfigIfExists(appDirName);
|
|
498
498
|
const newApplicationConfig = {
|
|
@@ -504,11 +504,19 @@ async function writeCodeModeApplicationToDisk(sdk, resource, appDirName, feature
|
|
|
504
504
|
await fs.writeFile(`${appDirName}/${RESOURCE_CONFIG_PATH}`, JSON.stringify(sortByKey(newApplicationConfig), null, 2));
|
|
505
505
|
// This writes to DBFS
|
|
506
506
|
try {
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
507
|
+
if (directoryContentsHash) {
|
|
508
|
+
await sdk.dbfsGetDirectoryByHash({
|
|
509
|
+
hash: directoryContentsHash,
|
|
510
|
+
localDirectoryPath: appDirName,
|
|
511
|
+
});
|
|
512
|
+
}
|
|
513
|
+
else {
|
|
514
|
+
await sdk.dbfsGetApplication({
|
|
515
|
+
applicationId: resource.application.id,
|
|
516
|
+
branch: branch ?? DEFAULT_BRANCH,
|
|
517
|
+
localDirectoryPath: appDirName,
|
|
518
|
+
});
|
|
519
|
+
}
|
|
512
520
|
}
|
|
513
521
|
catch (e) {
|
|
514
522
|
// This is most likely to happen if the application is not initialized
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-control.mjs","sourceRoot":"","sources":["../src/version-control.mts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"version-control.mjs","sourceRoot":"","sources":["../src/version-control.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-plugin-generate-api-build-manifest.d.mts","sourceRoot":"","sources":["../src/vite-plugin-generate-api-build-manifest.mts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AASnC;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"vite-plugin-generate-api-build-manifest.d.mts","sourceRoot":"","sources":["../src/vite-plugin-generate-api-build-manifest.mts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AASnC;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAsGpD,MAAM,CACZ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-plugin-generate-api-build-manifest.mjs","sourceRoot":"","sources":["../src/vite-plugin-generate-api-build-manifest.mts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,4CAA4C,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,EACL,WAAW,EACX,kBAAkB,GACnB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,MAAM,WAAW,CAAC;AAC3B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAWnD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,8BAA8B,CAAC,IAAY;IACzD,MAAM,UAAU,GAAG,YAAY,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,UAAU,CAAC,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpD,UAAU,CAAC,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE;QAChC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,CAAC,CAAC;IACF,UAAU,CAAC,QAAQ,GAAG,CAAC,GAAW,EAAE,EAAE;QACpC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,CAAC,CAAC;IACF,UAAU,CAAC,KAAK,GAAG,CAAC,GAAW,EAAE,EAAE;QACjC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC;IAEF,UAAU,CAAC,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IAElC,MAAM,aAAa,GAAG,gBAAgB,CACpC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAC1C,CAAC;IACF,MAAM,QAAQ,GAAuC,EAAE,CAAC;IACxD,IAAI,aAAa,
|
|
1
|
+
{"version":3,"file":"vite-plugin-generate-api-build-manifest.mjs","sourceRoot":"","sources":["../src/vite-plugin-generate-api-build-manifest.mts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@superblocksteam/sdk",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.100-next.1",
|
|
4
4
|
"description": "Superblocks JS SDK",
|
|
5
5
|
"homepage": "https://www.superblocks.com",
|
|
6
6
|
"license": "Superblocks Community Software License",
|
|
@@ -48,11 +48,11 @@
|
|
|
48
48
|
"vite-tsconfig-paths": "^6.0.4",
|
|
49
49
|
"winston": "^3.17.0",
|
|
50
50
|
"yaml": "^2.7.1",
|
|
51
|
-
"@superblocksteam/library-shared": "2.0.
|
|
52
|
-
"@superblocksteam/shared": "0.
|
|
53
|
-
"@superblocksteam/telemetry": "2.0.
|
|
54
|
-
"@superblocksteam/util": "2.0.
|
|
55
|
-
"@superblocksteam/vite-plugin-file-sync": "2.0.
|
|
51
|
+
"@superblocksteam/library-shared": "2.0.100-next.1",
|
|
52
|
+
"@superblocksteam/shared": "0.9569.1",
|
|
53
|
+
"@superblocksteam/telemetry": "2.0.100-next.1",
|
|
54
|
+
"@superblocksteam/util": "2.0.100-next.1",
|
|
55
|
+
"@superblocksteam/vite-plugin-file-sync": "2.0.100-next.1"
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
|
58
58
|
"@eslint/js": "^9.39.2",
|
|
@@ -7,6 +7,7 @@ import { SpanStatusCode } from "@opentelemetry/api";
|
|
|
7
7
|
import {
|
|
8
8
|
buildGithubSuperblocksSyncWorkflow,
|
|
9
9
|
ConflictError,
|
|
10
|
+
DEFAULT_NON_GIT_BRANCH,
|
|
10
11
|
isGitHubRemoteUrl,
|
|
11
12
|
NotFoundError,
|
|
12
13
|
SUPERBLOCKS_LIVE_GIT_BRANCH,
|
|
@@ -750,7 +751,10 @@ export async function dev(options: {
|
|
|
750
751
|
}
|
|
751
752
|
});
|
|
752
753
|
} catch (error: any) {
|
|
753
|
-
|
|
754
|
+
const msg = error instanceof Error ? error.message : String(error);
|
|
755
|
+
logger.error(
|
|
756
|
+
`[dev-server] Startup failed during sync/lock/setup (exiting with code 1): ${msg}`,
|
|
757
|
+
);
|
|
754
758
|
try {
|
|
755
759
|
await aiService?.removeIntegrationCache();
|
|
756
760
|
await lockService?.shutdownAndExit();
|
|
@@ -1052,27 +1056,46 @@ async function ensureGitRepo(
|
|
|
1052
1056
|
});
|
|
1053
1057
|
|
|
1054
1058
|
if (!remoteRefs.includes(`refs/heads/${SUPERBLOCKS_LIVE_GIT_BRANCH}`)) {
|
|
1055
|
-
//
|
|
1059
|
+
// superblocks/live doesn't exist on the remote yet. Only push
|
|
1060
|
+
// the default branch when the remote is truly empty; don't create
|
|
1061
|
+
// superblocks/live here — it should only be created when the user
|
|
1062
|
+
// makes an explicit commit from the version sidebar or Clark.
|
|
1056
1063
|
await seedGithubWorkflowIfNeeded(git.workDir, remoteUrl);
|
|
1057
|
-
|
|
1058
|
-
|
|
1059
|
-
|
|
1060
|
-
|
|
1061
|
-
|
|
1062
|
-
|
|
1063
|
-
|
|
1064
|
-
|
|
1065
|
-
|
|
1066
|
-
|
|
1067
|
-
|
|
1068
|
-
|
|
1069
|
-
|
|
1070
|
-
|
|
1071
|
-
|
|
1072
|
-
|
|
1073
|
-
|
|
1064
|
+
|
|
1065
|
+
let defaultBranch: string | undefined;
|
|
1066
|
+
try {
|
|
1067
|
+
defaultBranch = await git.getDefaultBranch();
|
|
1068
|
+
} catch (err) {
|
|
1069
|
+
getLogger().warn("[git] ensure repo default branch detection failed", {
|
|
1070
|
+
gitCategory: "setup",
|
|
1071
|
+
gitOperation: "ensure-repo",
|
|
1072
|
+
gitOutcome: "failed",
|
|
1073
|
+
gitRemote: "origin",
|
|
1074
|
+
gitRemoteUrl: remoteUrl,
|
|
1075
|
+
...getGitErrorFields(err),
|
|
1076
|
+
});
|
|
1077
|
+
defaultBranch = undefined;
|
|
1078
|
+
}
|
|
1079
|
+
|
|
1080
|
+
if (defaultBranch) {
|
|
1081
|
+
// Remote has a default branch — fetch it so we can set up the
|
|
1082
|
+
// local repo. If fetch fails, let it propagate; falling into
|
|
1083
|
+
// the empty-remote push path would be incorrect for a
|
|
1084
|
+
// non-empty remote.
|
|
1085
|
+
await git.raw(["fetch", "origin", defaultBranch]);
|
|
1086
|
+
// Use symbolic-ref + reset instead of checkout -b so that
|
|
1087
|
+
// --download-first files on disk are preserved.
|
|
1088
|
+
await git.raw(["symbolic-ref", "HEAD", `refs/heads/${defaultBranch}`]);
|
|
1089
|
+
await git.raw(["reset", `origin/${defaultBranch}`]);
|
|
1090
|
+
} else {
|
|
1091
|
+
// Truly empty remote — seed it with the default branch.
|
|
1092
|
+
await git.raw(["commit", "--allow-empty", "-m", "Setup Superblocks"]);
|
|
1093
|
+
const currentBranch = (
|
|
1094
|
+
await git.raw(["branch", "--show-current"])
|
|
1095
|
+
).trim();
|
|
1096
|
+
await git.push("origin", currentBranch);
|
|
1097
|
+
}
|
|
1074
1098
|
} else {
|
|
1075
|
-
// Remote already has superblocks/live — fetch and set up local branch.
|
|
1076
1099
|
await git.raw(["fetch", "origin"]);
|
|
1077
1100
|
await git.raw([
|
|
1078
1101
|
"symbolic-ref",
|
|
@@ -1238,6 +1261,7 @@ async function ensureRuntimeDbfsBranchConsistency({
|
|
|
1238
1261
|
nextBranchName: string,
|
|
1239
1262
|
options?: { reacquireLock?: boolean },
|
|
1240
1263
|
): Promise<void>;
|
|
1264
|
+
acquireLock(): Promise<void>;
|
|
1241
1265
|
}
|
|
1242
1266
|
interface BranchSwitchingSyncService {
|
|
1243
1267
|
setBranchName(nextBranchName: string): void;
|
|
@@ -1269,7 +1293,21 @@ async function ensureRuntimeDbfsBranchConsistency({
|
|
|
1269
1293
|
|
|
1270
1294
|
try {
|
|
1271
1295
|
syncSvc.setBranchName(targetBranchName);
|
|
1272
|
-
|
|
1296
|
+
try {
|
|
1297
|
+
await lockSvc.switchBranch(targetBranchName, {
|
|
1298
|
+
reacquireLock: wasLocked,
|
|
1299
|
+
});
|
|
1300
|
+
} catch (switchError) {
|
|
1301
|
+
// Disconnecting native git can invalidate the previous live branch
|
|
1302
|
+
// context. Fall back to explicit release/reacquire on the target branch.
|
|
1303
|
+
logger.warn(
|
|
1304
|
+
`Lock branch transfer failed for '${currentBranchName}' -> '${targetBranchName}', performing shutdown-style lock reset: ${switchError instanceof Error ? switchError.message : String(switchError)}`,
|
|
1305
|
+
);
|
|
1306
|
+
await lockSvc.switchBranch(targetBranchName, { reacquireLock: false });
|
|
1307
|
+
if (wasLocked) {
|
|
1308
|
+
await lockSvc.acquireLock();
|
|
1309
|
+
}
|
|
1310
|
+
}
|
|
1273
1311
|
// Align local workspace with the newly selected DBFS branch.
|
|
1274
1312
|
await syncService.downloadDirectory();
|
|
1275
1313
|
return targetBranchName;
|
|
@@ -1304,6 +1342,15 @@ async function resolveDbfsBranchName(
|
|
|
1304
1342
|
|
|
1305
1343
|
const fallbackBranchName = applicationConfig.branchName;
|
|
1306
1344
|
const gitAwareSdk = sdk as unknown as GitAwareSdk;
|
|
1345
|
+
const normalizeNonGitBranchFallback = (branchName: string): string => {
|
|
1346
|
+
if (branchName !== SUPERBLOCKS_LIVE_GIT_BRANCH) {
|
|
1347
|
+
return branchName;
|
|
1348
|
+
}
|
|
1349
|
+
logger.warn(
|
|
1350
|
+
`[git] stale '${SUPERBLOCKS_LIVE_GIT_BRANCH}' branch context detected after git disconnect; falling back to '${DEFAULT_NON_GIT_BRANCH}'`,
|
|
1351
|
+
);
|
|
1352
|
+
return DEFAULT_NON_GIT_BRANCH;
|
|
1353
|
+
};
|
|
1307
1354
|
|
|
1308
1355
|
try {
|
|
1309
1356
|
const gitConfig = await gitAwareSdk.getApplicationGitConfig(
|
|
@@ -1313,11 +1360,13 @@ async function resolveDbfsBranchName(
|
|
|
1313
1360
|
// If Git is connected, always use the live workspace branch.
|
|
1314
1361
|
return gitConfig?.gitRemoteUrl
|
|
1315
1362
|
? SUPERBLOCKS_LIVE_GIT_BRANCH
|
|
1316
|
-
: fallbackBranchName;
|
|
1363
|
+
: normalizeNonGitBranchFallback(fallbackBranchName);
|
|
1317
1364
|
} catch (error) {
|
|
1365
|
+
const normalizedFallbackBranchName =
|
|
1366
|
+
normalizeNonGitBranchFallback(fallbackBranchName);
|
|
1318
1367
|
logger.warn(
|
|
1319
|
-
`Could not resolve DBFS branch selection; falling back to '${
|
|
1368
|
+
`Could not resolve DBFS branch selection; falling back to '${normalizedFallbackBranchName}': ${error instanceof Error ? error.message : String(error)}`,
|
|
1320
1369
|
);
|
|
1321
|
-
return
|
|
1370
|
+
return normalizedFallbackBranchName;
|
|
1322
1371
|
}
|
|
1323
1372
|
}
|