create-ncblock 0.0.5 → 0.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-ncblock",
-	"version": "0.0.5",
+	"version": "0.0.6",
 	"description": "Create a Notion custom view block project.",
 	"type": "module",
 	"bin": {

package/scripts/init.ts

@@ -56,6 +56,8 @@ function parseArgs(argv: string[]) {
 			args.install = false
 		} else if (arg === "--force") {
 			args.force = true
+		} else if (arg === "--collection") {
+			args.collection = argv[++i]
 		} else if (!arg.startsWith("-")) {
 			positional.push(arg)
 		}
@@ -514,6 +516,32 @@ async function main() {
 		const installArgs = pm === "pnpm" ? "install --ignore-workspace" : "install"
 		execSync(`${pm} ${installArgs}`, { cwd: dest, stdio: "inherit" })
 		step("Installed dependencies")
+
+		// Ask for a collection URL / block ID to populate custom_blocks.json.
+		// Default to BLOCK_ID env var if set (the deploy flow already provides it).
+		const blockOrCollectionDefault = process.env.BLOCK_ID || "skip"
+		const blockOrCollectionId = (
+			await ask(
+				"Collection URL or block ID:",
+				blockOrCollectionDefault,
+				args.collection as string | undefined,
+			)
+		).trim()
+		if (blockOrCollectionId && blockOrCollectionId !== "skip") {
+			console.log("")
+			try {
+				execSync(`npx ncblock pull manifest ${blockOrCollectionId}`, {
+					cwd: dest,
+					stdio: "inherit",
+				})
+				step("Updated custom_blocks.json from collection schema")
+			} catch {
+				console.log(
+					`  ${c.yellow}Could not fetch collection schema. You can run this later:${c.reset}`,
+				)
+				console.log(`  npx ncblock pull manifest ${blockOrCollectionId}\n`)
+			}
+		}
 	}
 
 	const blockId = process.env.BLOCK_ID

package/scripts/utils/templates.ts

@@ -1,18 +1,13 @@
-import { execSync } from "child_process"
 import {
 	copyFileSync,
 	existsSync,
 	mkdirSync,
-	mkdtempSync,
 	readdirSync,
 	readFileSync,
-	rmSync,
 	statSync,
 	writeFileSync,
 } from "fs"
-import { tmpdir } from "os"
 import { resolve } from "path"
-import { cleanDist, stagePublishDir } from "./compile-sdk"
 
 type StoredTemplateMetadata = {
 	title?: string
@@ -116,12 +111,12 @@ type ScaffoldTemplateOptions = {
 	name: string
 	overwrite?: boolean
 	/**
-	 * If true, pack the in-repo SDK and rewrite the dep to `file:./<tgz>` so
-	 * scaffolded projects exercise uncommitted SDK changes. Used by
-	 * `test-scaffold` in CI. Default is false: the dep is rewritten to the SDK
-	 * version pinned in `sdk/package.json` so users install from the registry.
+	 * Optional override for the `ncblock` dependency value written into the
+	 * scaffolded `package.json`. Defaults to `^<version>` resolved from the
+	 * SDK version metadata. Tests pass a `file:./<tgz>` here to point
+	 * scaffolded projects at a locally-built SDK tarball.
 	 */
-	localSdk?: boolean
+	sdkDep?: string
 }
 
 const SDK_PACKAGE_NAME = "ncblock"
@@ -144,23 +139,6 @@ function readSdkVersion(root: string): string {
 	return sdkPkg.version
 }
 
-function packLocalSdk(root: string, dest: string): string {
-	const sdkDir = resolve(root, "sdk")
-	const publishDir = stagePublishDir(sdkDir)
-	try {
-		const tgzOutput = execSync("npm pack --pack-destination .", {
-			cwd: publishDir,
-			encoding: "utf-8",
-		}).trim()
-		const tgz = tgzOutput.split(/\r?\n/).at(-1) ?? tgzOutput
-		copyFileSync(resolve(publishDir, tgz), resolve(dest, tgz))
-		return `file:./${tgz}`
-	} finally {
-		rmSync(publishDir, { recursive: true, force: true })
-		cleanDist(sdkDir)
-	}
-}
-
 function copyDirectoryContents(
 	sourceDir: string,
 	targetDir: string,
@@ -205,7 +183,7 @@ export function scaffoldTemplate({
 	dest,
 	name,
 	overwrite = false,
-	localSdk = false,
+	sdkDep,
 }: ScaffoldTemplateOptions) {
 	copyDirectoryContents(templateDir, dest, {
 		overwrite,
@@ -242,57 +220,7 @@ export function scaffoldTemplate({
 	pkg.name = name
 	delete pkg.notionCustomTemplate
 	if (pkg.dependencies?.[SDK_PACKAGE_NAME]) {
-		pkg.dependencies[SDK_PACKAGE_NAME] = localSdk
-			? packLocalSdk(root, dest)
-			: `^${readSdkVersion(root)}`
+		pkg.dependencies[SDK_PACKAGE_NAME] = sdkDep ?? `^${readSdkVersion(root)}`
 	}
 	writeFileSync(pkgPath, JSON.stringify(pkg, null, "\t") + "\n")
 }
-
-export type ScaffoldedTemplate = {
-	template: string
-	dest: string
-}
-
-type ScaffoldAllOptions = {
-	root: string
-	templatesDir: string
-	pm: string
-	install?: boolean
-	localSdk?: boolean
-}
-
-export function scaffoldAllTemplates({
-	root,
-	templatesDir,
-	pm,
-	install = true,
-	localSdk = false,
-}: ScaffoldAllOptions): ScaffoldedTemplate[] {
-	const templates = listTemplates(templatesDir)
-	const results: ScaffoldedTemplate[] = []
-
-	for (const template of templates) {
-		const dest = mkdtempSync(resolve(tmpdir(), `custom-${template}-`))
-		const templateDir = resolve(templatesDir, template)
-
-		console.log(`[${template}] Scaffolding → ${dest}`)
-		scaffoldTemplate({
-			root,
-			templateDir,
-			dest,
-			name: template,
-			overwrite: true,
-			localSdk,
-		})
-
-		if (install) {
-			console.log(`[${template}] Installing dependencies...`)
-			execSync(`${pm} install`, { cwd: dest, stdio: "inherit" })
-		}
-
-		results.push({ template, dest })
-	}
-
-	return results
-}

package/sdk-version.json

@@ -1 +1 @@
-{"version":"0.0.7"}
+{"version":"0.0.9"}

package/scripts/utils/compile-sdk.ts

@@ -1,101 +0,0 @@
-/**
- * Compiles the SDK and stages a publish-ready directory. Used by both
- * `publish-sdk.ts` and `packLocalSdk` so the same compiled artifact is tested
- * locally and shipped to npm.
- */
-
-import { execSync } from "child_process"
-import { cpSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "fs"
-import { tmpdir } from "os"
-import { resolve } from "path"
-
-function rewrite(value: string): string {
-	return value.replace("src/", "dist/").replace(/\.tsx?$/, ".js")
-}
-
-function rewriteDts(value: string): string {
-	return value.replace("src/", "dist/").replace(/\.tsx?$/, ".d.ts")
-}
-
-function isPrebuilt(value: string): boolean {
-	return /\.(js|d\.ts)$/.test(value)
-}
-
-export function createPublishPackageJson(sdkDir: string): string {
-	const pkg = JSON.parse(readFileSync(resolve(sdkDir, "package.json"), "utf-8"))
-
-	if (pkg.main && !isPrebuilt(pkg.main)) {
-		pkg.main = `./${rewrite(pkg.main)}`
-	}
-	if (pkg.types && !isPrebuilt(pkg.types)) {
-		pkg.types = `./${rewriteDts(pkg.types)}`
-	}
-
-	if (pkg.exports) {
-		for (const key of Object.keys(pkg.exports)) {
-			const entry = pkg.exports[key]
-			if (typeof entry === "string") {
-				if (!isPrebuilt(entry)) {
-					pkg.exports[key] = `./${rewrite(entry)}`
-				}
-			} else if (typeof entry === "object" && entry !== null) {
-				for (const condition of Object.keys(entry)) {
-					const target = entry[condition]
-					if (typeof target !== "string" || isPrebuilt(target)) {
-						continue
-					}
-					entry[condition] =
-						condition === "types"
-							? `./${rewriteDts(target)}`
-							: `./${rewrite(target)}`
-				}
-			}
-		}
-	}
-
-	return JSON.stringify(pkg, null, "\t") + "\n"
-}
-
-export function compileSdk(sdkDir: string) {
-	execSync("pnpm exec tsc --project tsconfig.json", {
-		cwd: sdkDir,
-		stdio: "inherit",
-	})
-}
-
-export function cleanDist(sdkDir: string) {
-	rmSync(resolve(sdkDir, "dist"), { recursive: true, force: true })
-}
-
-/**
- * Compiles the SDK and stages a publish-ready directory: compiled `dist/`,
- * rewritten `package.json`, and all publishable files. Returns the path to
- * the staged directory — caller is responsible for cleanup.
- */
-export function stagePublishDir(sdkDir: string): string {
-	cleanDist(sdkDir)
-	console.log("Compiling SDK...")
-	compileSdk(sdkDir)
-
-	const publishDir = mkdtempSync(resolve(tmpdir(), "custom-sdk-publish-"))
-	cpSync(sdkDir, publishDir, {
-		recursive: true,
-		filter: src => {
-			const rel = src.slice(sdkDir.length + 1)
-			if (!rel) {
-				return true
-			}
-			const top = rel.split("/")[0]
-			return top !== "node_modules" && top !== "test" && top !== "dist"
-		},
-	})
-	cpSync(resolve(sdkDir, "dist"), resolve(publishDir, "dist"), {
-		recursive: true,
-	})
-	writeFileSync(
-		resolve(publishDir, "package.json"),
-		createPublishPackageJson(sdkDir),
-	)
-
-	return publishDir
-}