polen 0.8.0-next.9 → 0.8.1-next.1

package/src/api/config/load.ts

@@ -1,7 +1,11 @@
-import { assertOptionalPathAbsolute, pickFirstPathExisting } from '#lib/kit-temp.js'
+import type { SelfContainedModeHooksData } from '#cli/_/self-contained-mode'
+import { assertOptionalPathAbsolute, pickFirstPathExisting } from '#lib/kit-temp'
+import { packagePaths } from '#package-paths'
+import { debug } from '#singletons/debug'
 import type { Prom } from '@wollybeard/kit'
 import { Path } from '@wollybeard/kit'
-import type { ConfigInput } from './configurator.js'
+import * as Module from 'node:module'
+import type { ConfigInput } from './configurator.ts'
 
 export const fileNameBases = [`polen.config`, `.polen.config`]
 export const fileNameExtensionsTypeScript = [`.ts`, `.js`, `.mjs`, `.mts`]
@@ -13,40 +17,87 @@ export interface LoadOptions {
   dir: string
 }
 
+let isSelfContainedModeRegistered = false
+
 export const load = async (options: LoadOptions): Promise<ConfigInput> => {
+  const _debug = debug.sub(`load`)
   assertOptionalPathAbsolute(options.dir)
 
+  //
+  // ━━ Enable Self-Contained Mode
+  //
+  //  - When we're running CLI from source code
+  //  - Do this BEFORE trying to load the config file
+  //
+
+  const isSelfContainedModeEnabled = packagePaths.isRunningFromSource
+  if (isSelfContainedModeEnabled && !isSelfContainedModeRegistered) {
+    const initializeData: SelfContainedModeHooksData = {
+      projectDirPathExp: options.dir,
+    }
+    _debug(`register node module hooks`, { data: initializeData })
+    // TODO: would be simpler to use sync hooks
+    // https://nodejs.org/api/module.html#synchronous-hooks-accepted-by-moduleregisterhooks
+    // Requires NodeJS 22.15+ -- which is not working with PW until its next release.
+    Module.register(`#cli/_/self-contained-mode`, import.meta.url, { data: initializeData })
+    isSelfContainedModeRegistered = true
+  }
+
+  //
+  // ━━ Fetch the Config
+  //
+
   const filePaths = fileNames.map(fileName => Path.join(options.dir, fileName))
   const filePath = await pickFirstPathExisting(filePaths)
 
-  if (!filePath) return {}
+  let configInput: ConfigInput | undefined = undefined
+  if (!filePath) {
+    configInput = {}
+  } else {
+    // If the user's config is a TypeScript file, we will use TSX to import it.
+    // TODO: Use NodeJS's native ESM support for TypeScript files.
 
-  let module: { default?: Prom.Maybe<ConfigInput>; config?: Prom.Maybe<ConfigInput> }
+    let module: { default?: Prom.Maybe<ConfigInput>; config?: Prom.Maybe<ConfigInput> }
+    if (fileNameExtensionsTypeScript.some(_ => filePath.endsWith(_))) {
+      // @see https://tsx.is/dev-api/ts-import#usage
+      const { tsImport } = await import(`tsx/esm/api`)
+      // eslint-disable-next-line
+      module = await tsImport(filePath, import.meta.url)
+    } else {
+      // eslint-disable-next-line
+      module = await import(filePath)
+    }
+    _debug(`imported config module`)
 
-  if (fileNameExtensionsTypeScript.some(_ => filePath.endsWith(_))) {
-    // @see https://tsx.is/dev-api/ts-import#usage
-    const { tsImport } = await import(`tsx/esm/api`)
-    // eslint-disable-next-line
-    module = await tsImport(filePath, import.meta.url)
-  } else {
-    // eslint-disable-next-line
-    module = await import(filePath)
-  }
+    //       // Use dynamic import with file URL to support Windows
+    //       const configUrl = pathToFileURL(configPath).href
 
-  //       // Use dynamic import with file URL to support Windows
-  //       const configUrl = pathToFileURL(configPath).href
+    // todo: report errors nicely if this fails
+    const configInputFromFile = await (module.default ?? module.config)
 
-  // todo: report errors nicely if this fails
-  const configInput = await (module.default ?? module.config)
+    // todo: check schema of configInput
 
-  // todo: check schema of configInput
+    // todo: report errors nicely
+    if (!configInputFromFile) {
+      throw new Error(
+        `Your Polen config module (${filePath}) must export a config. You can use a default export or named export of \`config\`.`,
+      )
+    }
+    configInput = configInputFromFile
+  }
 
-  // todo: report errors nicely
-  if (!configInput) {
-    throw new Error(
-      `Your Polen config module (${filePath}) must export a config. You can use a default export or named export of \`config\`.`,
-    )
+  //
+  // ━━ Record Any Change of Self-Contained Mode
+  //
+  //  - This will enable a Vite plugin to handle polen imports from non-JS files
+  //    in the user's project (like Markdown) in a self-contained way.
+
+  if (isSelfContainedModeEnabled) {
+    configInput.advanced ??= {}
+    configInput.advanced.isSelfContainedMode = true
   }
 
+  _debug(`loaded config input`, configInput)
+
   return configInput
 }

package/src/api/config/merge.ts

@@ -1,5 +1,5 @@
-import { Vite } from '#dep/vite/index.js'
-import type { ConfigInput } from './configurator.js'
+import { Vite } from '#dep/vite/index'
+import type { ConfigInput } from './configurator.ts'
 
 /**
  * Deep merge two Polen config inputs.

package/src/api/config-resolver/config-resolver.ts

@@ -1,2 +1,2 @@
-export * from './resolve.js'
-export * from './vite.js'
+export * from './resolve.ts'
+export * from './vite.ts'

package/src/api/config-resolver/index.ts

@@ -1 +1 @@
-export * as ConfigResolver from './config-resolver.js'
+export * as ConfigResolver from './config-resolver.ts'

package/src/api/config-resolver/resolve.ts

@@ -1,7 +1,8 @@
-import { type ConfigInput, normalizeInput } from '../config/configurator.js'
-import { load, type LoadOptions } from '../config/load.js'
-import { mergeInputs } from '../config/merge.js'
-import { toViteUserConfig, type ViteUserConfigWithPolen } from './vite.js'
+import { debug } from '#singletons/debug'
+import { type ConfigInput, normalizeInput } from '../config/configurator.ts'
+import { load, type LoadOptions } from '../config/load.ts'
+import { mergeInputs } from '../config/merge.ts'
+import { toViteUserConfig, type ViteUserConfigWithPolen } from './vite.ts'
 
 interface ResolveFromFileOptions extends LoadOptions {
   overrides?: ConfigInput
@@ -10,7 +11,9 @@ interface ResolveFromFileOptions extends LoadOptions {
 export const fromFile = async (options: ResolveFromFileOptions): Promise<ViteUserConfigWithPolen> => {
   const configInput = await load(options)
   const configInputMerged = mergeInputs(configInput, options.overrides)
-  return fromMemory(configInputMerged, options.dir)
+  const config = await fromMemory(configInputMerged, options.dir)
+  debug(`resolved config`, config)
+  return config
 }
 
 export const fromMemory = async (

package/src/api/config-resolver/vite.ts

@@ -1,6 +1,6 @@
-import { Main } from '#api/vite/plugins/main.js'
-import { Vite } from '#dep/vite/index.js'
-import type { Config } from '../config/configurator.js'
+import { Main } from '#api/vite/plugins/main'
+import { Vite } from '#dep/vite/index'
+import type { Config } from '../config/configurator.ts'
 
 /**
  * Transform Polen config input into a Vite configuration.

package/src/api/index.ts

@@ -1 +1 @@
-export * as Api from './api.js'
+export * as Api from './api.ts'

package/src/api/schema/data-sources/data-sources.ts

@@ -1,3 +1,3 @@
-export * as Memory from './memory/memory.js'
-export * as SchemaDirectory from './schema-directory/schema-directory.js'
-export * as SchemaFile from './schema-file/schema-file.js'
+export * as Memory from './memory/memory.ts'
+export * as SchemaDirectory from './schema-directory/schema-directory.ts'
+export * as SchemaFile from './schema-file/schema-file.ts'

package/src/api/schema/data-sources/index.ts

@@ -1 +1 @@
-export * as DataSources from './data-sources.js'
+export * as DataSources from './data-sources.ts'

package/src/api/schema/data-sources/memory/memory.ts

@@ -1,8 +1,8 @@
-import { Grafaid } from '#lib/grafaid/index.js'
-import { GraphqlChange } from '#lib/graphql-change/index.js'
-import type { GraphqlChangeset } from '#lib/graphql-changeset/index.js'
+import { Grafaid } from '#lib/grafaid/index'
+import { GraphqlChange } from '#lib/graphql-change/index'
+import type { GraphqlChangeset } from '#lib/graphql-changeset/index'
 import { Arr } from '@wollybeard/kit'
-import type { Schema } from '../../schema.js'
+import type { Schema } from '../../schema.ts'
 
 export interface ConfigInput {
   versions:

package/src/api/schema/data-sources/schema-directory/file-name-expression/index.ts

@@ -1 +1 @@
-export * as FileNameExpression from './file-name-expression.js'
+export * as FileNameExpression from './file-name-expression.ts'

package/src/api/schema/data-sources/schema-directory/schema-directory.ts

@@ -1,13 +1,13 @@
-import { Debug } from '#lib/debug/index.js'
-import { Grafaid } from '#lib/grafaid/index.js'
-import { GraphqlChange } from '#lib/graphql-change/index.js'
-import type { GraphqlChangeset } from '#lib/graphql-changeset/index.js'
+import { Grafaid } from '#lib/grafaid/index'
+import { GraphqlChange } from '#lib/graphql-change/index'
+import type { GraphqlChangeset } from '#lib/graphql-changeset/index'
+import { debug as debugPolen } from '#singletons/debug'
 import { Arr, Path } from '@wollybeard/kit'
 import { glob } from 'tinyglobby'
-import type { Schema } from '../../schema.js'
-import { FileNameExpression } from './file-name-expression/index.js'
+import type { Schema } from '../../schema.ts'
+import { FileNameExpression } from './file-name-expression/index.ts'
 
-const debug = Debug.create(`polen:schema:data-source-schema-directory`)
+const debug = debugPolen.sub([`schema`, `data-source-schema-directory`])
 
 const defaultPaths = {
   schemaDirectory: `./schema`,

package/src/api/schema/data-sources/schema-file/schema-file.ts

@@ -1,8 +1,8 @@
-import { Grafaid } from '#lib/grafaid/index.js'
-import { GraphqlChange } from '#lib/graphql-change/index.js'
-import type { GraphqlChangeset } from '#lib/graphql-changeset/index.js'
+import { Grafaid } from '#lib/grafaid/index'
+import { GraphqlChange } from '#lib/graphql-change/index'
+import type { GraphqlChangeset } from '#lib/graphql-changeset/index'
 import { Path } from '@wollybeard/kit'
-import type { Schema } from '../../schema.js'
+import type { Schema } from '../../schema.ts'
 
 const defaultPaths = {
   schemaFile: `./schema.graphql`,

package/src/api/schema/index.ts

@@ -1 +1 @@
-export * as Schema from './schema.js'
+export * as Schema from './schema.ts'

package/src/api/schema/read.ts

@@ -1,6 +1,6 @@
 import { Arr } from '@wollybeard/kit'
-import * as DataSources from './data-sources/data-sources.js'
-import type { Schema } from './schema.js'
+import * as DataSources from './data-sources/data-sources.ts'
+import type { Schema } from './schema.ts'
 
 export type DataSourceType = `file` | `directory` | `memory` | `data`
 

package/src/api/schema/schema.ts

@@ -1,8 +1,8 @@
-import type { GraphqlChangeset } from '#lib/graphql-changeset/index.js'
+import type { GraphqlChangeset } from '#lib/graphql-changeset/index'
 
-export * as DataSources from './data-sources/data-sources.js'
+export * as DataSources from './data-sources/data-sources.ts'
 
-export * from './read.js'
+export * from './read.ts'
 
 export interface Schema {
   versions: [GraphqlChangeset.ChangeSet, ...GraphqlChangeset.ChangeSet[]]

package/src/api/schema-augmentation/augmentations/description.ts

@@ -1,7 +1,7 @@
-import type { GrafaidOld } from '#lib/grafaid-old/index.js'
+import type { GrafaidOld } from '#lib/grafaid-old/index'
 import { neverCase } from '@wollybeard/kit/language'
-import type { Target } from '../target.js'
-import { locateTargetField, locateTargetType } from '../target.js'
+import type { Target } from '../target.ts'
+import { locateTargetField, locateTargetType } from '../target.ts'
 
 export const Placement = {
   Before: `before`,

package/src/api/schema-augmentation/index.ts

@@ -1 +1 @@
-export * as SchemaAugmentation from './schema-augmentation.js'
+export * as SchemaAugmentation from './schema-augmentation.ts'

package/src/api/schema-augmentation/schema-augmentation.ts

@@ -1,6 +1,6 @@
-import type { GrafaidOld } from '#lib/grafaid-old/index.js'
+import type { GrafaidOld } from '#lib/grafaid-old/index'
 import { neverCase } from '@wollybeard/kit/language'
-import * as AugmentationDescription from './augmentations/description.js'
+import * as AugmentationDescription from './augmentations/description.ts'
 
 export { AugmentationDescription }
 

package/src/api/schema-augmentation/target.ts

@@ -1,4 +1,4 @@
-import { Grafaid } from '#lib/grafaid/index.js'
+import { Grafaid } from '#lib/grafaid/index'
 
 export type Target = TargetType | TargetField
 

package/src/api/singletons/markdown/index.ts

@@ -1 +1 @@
-export * as Markdown from './markdown.js'
+export * as Markdown from './markdown.ts'

package/src/api/vite/log-filters.ts

@@ -1,4 +1,4 @@
-import { Vite } from '#dep/vite/index.js'
+import { Vite } from '#dep/vite/index'
 
 export const isKitUnusedExternalImport = (
   message: Vite.Rollup.RollupLog,

package/src/api/vite/logger.ts

@@ -1,12 +1,28 @@
-import { Vite } from '#dep/vite/index.js'
+import { Vite } from '#dep/vite/index'
 import { Err, Str } from '@wollybeard/kit'
 import { stripAnsi } from 'consola/utils'
 
-export const logger = Vite.createLogger(undefined)
+const baseLogger = Vite.createLogger(undefined)
 
-logger.error = (msg, options) => {
-  const firstLine = stripAnsi(Str.lines(msg)[0] ?? `<no message>`)
-  const cause = options?.error
-  const error = new Error(firstLine, { cause })
-  Err.log(error)
+export const logger: Vite.Logger = {
+  ...baseLogger,
+  info(msg, options) {
+    // Filter out optimization-related messages
+    const msgString = typeof msg === 'string' ? msg : String(msg)
+    if (
+      msgString.includes('new dependencies optimized')
+      || msgString.includes('optimized dependencies changed')
+      || msgString.includes('Re-optimizing dependencies')
+      || msgString.includes('Forced re-optimization')
+    ) {
+      return
+    }
+    baseLogger.info(msg, options)
+  },
+  error(msg, options) {
+    const firstLine = stripAnsi(Str.lines(msg)[0] ?? `<no message>`)
+    const cause = options?.error
+    const error = new Error(firstLine, { cause })
+    Err.log(error)
+  },
 }

package/src/api/vite/plugins/build.ts

@@ -1,9 +1,9 @@
-import type { Config } from '#api/config/index.js'
-import { Vite } from '#dep/vite/index.js'
-import { ViteVirtual } from '#lib/vite-virtual/index.js'
+import type { Config } from '#api/config/index'
+import { Vite } from '#dep/vite/index'
+import { ViteVirtual } from '#lib/vite-virtual/index'
 import { Fs, Path } from '@wollybeard/kit'
-import { isKitUnusedExternalImport, isRadixModuleLevelDirective } from '../log-filters.js'
-import { vi } from '../vi.js'
+import { isKitUnusedExternalImport, isRadixModuleLevelDirective } from '../log-filters.ts'
+import { polenVirtual } from '../vi.ts'
 
 export const Build = (config: Config.Config): Vite.Plugin[] => {
   // let viteConfigResolved: Vite.ResolvedConfig
@@ -114,7 +114,7 @@ export const Build = (config: Config.Config): Vite.Plugin[] => {
   }]
 }
 
-const viClientManifest = vi([`vite`, `client`, `manifest`])
+const viClientManifest = polenVirtual([`vite`, `client`, `manifest`])
 
 const Manifest = (config: Config.Config): Vite.Plugin => {
   let configEnv: Vite.ConfigEnv