wip: rename factor to fiction

Author: arpowers

.pnpmfile.cjs

@@ -5,7 +5,7 @@
 // const localInstall = process.env.INSTALL_ENV === 'local'
 function rewriteFactorDependency(deps) {
   // Object.entries(deps).forEach(([name, version]) => {
-  //   if (name.includes("@factor")) {
+  //   if (name.includes("@fiction")) {
   //     deps[name] =
   //       exists && localInstall ? `file:~/Projects/factor/${name}` : "latest"
   //   }

.prettierignore

@@ -2,4 +2,4 @@
 **/.ref*/**
 **/dist/**
 *-lock*
-**/.factor/**
+**/.gen/**

@factor/api/dec.d.ts renamed to @fiction/core/dec.d.ts

@@ -1,5 +1,5 @@
 declare module '*.md' {
-  import type { MarkdownFile } from '@factor/api'
+  import type { MarkdownFile } from '@fiction/core'
 
   const src: MarkdownFile
   export = src

@factor/api/env.d.ts renamed to @fiction/core/env.d.ts

@@ -177,7 +177,7 @@
   },
   "license": "MIT",
   "main": "index.ts",
-  "name": "@factor/api",
+  "name": "@fiction/core",
   "publishConfig": {
     "access": "public"
   },

@factor/api/envVars.ts renamed to @fiction/core/envVars.ts

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useService } from '@factor/api'
+import { useService } from '@fiction/core'
 
 const { factorApp } = useService()
 

@factor/api/index.ts renamed to @fiction/core/index.ts

@@ -3,12 +3,12 @@ import path from 'node:path'
 
 import type playwright from 'playwright'
 import { afterAll, beforeAll, describe, expect, it } from 'vitest'
-import type { TestServerConfig } from '@factor/api/test-utils/buildTest'
-import { createTestServer } from '@factor/api/test-utils/buildTest'
-import { commands } from '@factor/www/src/vars'
+import type { TestServerConfig } from '@fiction/core/test-utils/buildTest'
+import { createTestServer } from '@fiction/core/test-utils/buildTest'
+import { commands } from '@fiction/www/src/vars'
 
 const require = createRequire(import.meta.url)
-const cwd = path.dirname(require.resolve('@factor/www/package.json'))
+const cwd = path.dirname(require.resolve('@fiction/www/package.json'))
 let testServer: TestServerConfig | undefined
 
 function page(): playwright.Page {
@@ -50,6 +50,6 @@ describe('renders app code correctly', () => {
     expect(appNameText).toMatchInlineSnapshot('"FactorJS"')
 
     const appEmailText = await page().locator(`#app-email`).textContent()
-    expect(appEmailText).toMatchInlineSnapshot('"hi@factorjs.org"')
+    expect(appEmailText).toMatchInlineSnapshot('"hi@fictionjs.org"')
   }, 20_000)
 })

@factor/api/inject.ts renamed to @fiction/core/inject.ts

@@ -1,5 +1,5 @@
-import type { TestUtils } from '@factor/api/test-utils'
-import { createTestUtils } from '@factor/api/test-utils'
+import type { TestUtils } from '@fiction/core/test-utils'
+import { createTestUtils } from '@fiction/core/test-utils'
 import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { FactorRender } from '../plugin-render'
 

@factor/api/obj.ts renamed to @fiction/core/obj.ts

@@ -1,5 +1,5 @@
-import type { TestUtils } from '@factor/api/test-utils/init'
-import { createTestUtils } from '@factor/api/test-utils/init'
+import type { TestUtils } from '@fiction/core/test-utils/init'
+import { createTestUtils } from '@fiction/core/test-utils/init'
 import { beforeAll, describe, expect, it } from 'vitest'
 import type * as vite from 'vite'
 

@factor/api/package.json renamed to @fiction/core/package.json

@@ -171,11 +171,11 @@ export class FactorBuild extends FactorPlugin<FactorBuildSettings> {
 
     return {
       exclude: [
-        '@factor/api',
-        '@factor/ui',
-        '@factor/plugin-notify',
-        '@factor/plugin-stripe',
-        '@factor/plugin-highlight-code',
+        '@fiction/core',
+        '@fiction/ui',
+        '@fiction/plugin-notify',
+        '@fiction/plugin-stripe',
+        '@fiction/plugin-highlight-code',
         '@kaption/client',
         'vue',
         'vite',
@@ -228,15 +228,15 @@ export class FactorBuild extends FactorPlugin<FactorBuildSettings> {
       // root must be set to optimize output file size
       root,
       ssr: {
-        noExternal: [/@factor.*/, /@pagelines.*/, /@fiction.*/, 'util'],
+        noExternal: [/@fiction.*/, /@pagelines.*/, /@fiction.*/, 'util'],
       },
       server: {
         fs: { strict: false },
 
         watch: {
           ignored: [
-            '!**/node_modules/@factor/**',
-            '!**/node_modules/**/@factor/**',
+            '!**/node_modules/@fiction/**',
+            '!**/node_modules/**/@fiction/**',
           ],
         },
         // SET A CUSTOM HMR PORT

@factor/api/plugin-app/ElRoot.vue renamed to @fiction/core/plugin-app/ElRoot.vue

@@ -2,10 +2,10 @@ import type {
   EndpointResponse,
   FactorAws,
   FactorDb,
-} from '@factor/api'
+} from '@fiction/core'
 import {
   Query,
-} from '@factor/api'
+} from '@fiction/core'
 
 // import type { Invalidation } from "@aws-sdk/client-cloudfront"
 import type { FactorCache } from '.'

@factor/api/plugin-app/index.ts renamed to @fiction/core/plugin-app/index.ts

@@ -1,4 +1,4 @@
-import type { EndpointResponse, ResponseStatus, ValidationReason } from '@factor/api'
+import type { EndpointResponse, ResponseStatus, ValidationReason } from '@fiction/core'
 import { Query } from '../query'
 import { words } from '../utils/lib/words'
 import type { FactorDb } from '.'

@factor/api/plugin-app/mount.ts renamed to @fiction/core/plugin-app/mount.ts

@@ -15,7 +15,7 @@ export async function transpiler() {
   /**
    * Allow Node to process TypeScript
    */
-  const transpileModules = ['@factor', '.*factor', '@kaption', 'dayjs', '.pnpm']
+  const transpileModules = ['@fiction', '.*factor', '@kaption', 'dayjs', '.pnpm']
   tsNode.register({
     transpileOnly: true,
     compilerOptions: {

@factor/api/plugin-app/plugin-render.ts renamed to @fiction/core/plugin-app/plugin-render.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --import=tsx --import=@factor/api/plugin-env/loader.mjs
+#!/usr/bin/env node --import=tsx --import=@fiction/core/plugin-env/loader.mjs
 
 const { execute } = await import('./cliProgram')
 

@factor/api/plugin-app/sitemap.ts renamed to @fiction/core/plugin-app/sitemap.ts

@@ -4,11 +4,11 @@
 
 import type { Mock } from 'vitest'
 import { beforeAll, describe, expect, it, vi } from 'vitest'
-import { randomBetween, safeDirname, vue, waitFor } from '@factor/api/utils'
-import { FactorApp } from '@factor/api/plugin-app'
-import { FactorRouter } from '@factor/api/plugin-router'
-import type { FactorPluginSettings } from '@factor/api/plugin'
-import { FactorPlugin } from '@factor/api/plugin'
+import { randomBetween, safeDirname, vue, waitFor } from '@fiction/core/utils'
+import { FactorApp } from '@fiction/core/plugin-app'
+import { FactorRouter } from '@fiction/core/plugin-router'
+import type { FactorPluginSettings } from '@fiction/core/plugin'
+import { FactorPlugin } from '@fiction/core/plugin'
 import { CliCommand, FactorEnv } from '..'
 import type { ServiceConfig } from '../types'
 

@factor/api/plugin-app/sitemap.xsl renamed to @fiction/core/plugin-app/sitemap.xsl

@@ -1,9 +1,9 @@
 import path from 'node:path'
-import { createTestUtils } from '@factor/api/test-utils/init'
+import { createTestUtils } from '@fiction/core/test-utils/init'
 import { beforeAll, describe, expect, it } from 'vitest'
 import fs from 'fs-extra'
-import { safeDirname } from '@factor/api/utils'
-import { generateStaticConfig } from '@factor/api/plugin-env/generate'
+import { safeDirname } from '@fiction/core/utils'
+import { generateStaticConfig } from '@fiction/core/plugin-env/generate'
 
 const root = new URL('.', import.meta.url).pathname
 describe('test config generator', () => {

@factor/api/plugin-app/test/TestRunVars.vue renamed to @fiction/core/plugin-app/test/TestRunVars.vue

@@ -7,7 +7,7 @@ import { fileFromPath } from 'formdata-node/file-from-path'
 
 import { describe, expect, it } from 'vitest'
 import { FormData } from 'formdata-node'
-import type { EndpointMeta } from '@factor/api/utils'
+import type { EndpointMeta } from '@fiction/core/utils'
 import type { TestUtils } from '../../test-utils/init'
 import { createTestUtils } from '../../test-utils/init'
 import { testEnvFile, testImgPath } from '../../test-utils'

@factor/api/plugin-app/test/__appServeRender.ci.test.ts renamed to @fiction/core/plugin-app/test/__appServeRender.ci.test.ts

@@ -1,4 +1,4 @@
-import type { TableMediaConfig } from '@factor/api'
+import type { TableMediaConfig } from '@fiction/core'
 
 export type MediaDisplayObject = {
   _key?: string

@factor/api/plugin-app/test/renderHtml.ci.test.ts renamed to @fiction/core/plugin-app/test/renderHtml.ci.test.ts

@@ -1,6 +1,6 @@
-import { createTestUtils } from '@factor/api/test-utils/init'
+import { createTestUtils } from '@fiction/core/test-utils/init'
 import { describe, expect, it } from 'vitest'
-import { waitFor } from '@factor/api/utils'
+import { waitFor } from '@fiction/core/utils'
 import { AppRoute } from '../appRoute'
 import { FactorRouter } from '..'
 

@factor/api/plugin-app/test/rendering.alpha.test.ts renamed to @fiction/core/plugin-app/test/rendering.alpha.test.ts

@@ -2,12 +2,12 @@
  * @vitest-environment happy-dom
  */
 import type http from 'node:http'
-import type { TestUtils } from '@factor/api/test-utils/init'
-import { createTestUtils } from '@factor/api/test-utils/init'
+import type { TestUtils } from '@fiction/core/test-utils/init'
+import { createTestUtils } from '@fiction/core/test-utils/init'
 import { afterEach, beforeAll, describe, expect, it } from 'vitest'
-import { axios, randomBetween, vue } from '@factor/api/utils'
-import type { EndpointResponse } from '@factor/api/types'
-import { FactorUser } from '@factor/api/plugin-user'
+import { axios, randomBetween, vue } from '@fiction/core/utils'
+import type { EndpointResponse } from '@fiction/core/types'
+import { FactorUser } from '@fiction/core/plugin-user'
 import { FactorServer } from '..'
 
 let testUtils: TestUtils

@factor/api/plugin-app/test/viteConfig.alpha.test.ts renamed to @fiction/core/plugin-app/test/viteConfig.alpha.test.ts

@@ -1,7 +1,7 @@
 import { beforeAll, describe, expect, it } from 'vitest'
-import type { TestUtils } from '@factor/api/test-utils/init'
-import { createTestUtils } from '@factor/api/test-utils/init'
-import type { OrganizationMember } from '@factor/api/plugin-user/types'
+import type { TestUtils } from '@fiction/core/test-utils/init'
+import { createTestUtils } from '@fiction/core/test-utils/init'
+import type { OrganizationMember } from '@fiction/core/plugin-user/types'
 import { FactorTeam } from '..'
 import { snap } from '../../test-utils'
 

@factor/api/plugin-app/types.ts renamed to @fiction/core/plugin-app/types.ts

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import ElButton from '@factor/ui/ElButton.vue'
+import ElButton from '@fiction/ui/ElButton.vue'
 import { useService } from '../inject'
 import type { FactorRouter } from '../plugin-router'
 

@factor/api/plugin-app/utils/favicon.ts renamed to @fiction/core/plugin-app/utils/favicon.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { createTestUtils } from '@factor/api/test-utils/init'
+import { createTestUtils } from '@fiction/core/test-utils/init'
 import type { Organization, User } from '..'
 
 let user: User | undefined

@factor/api/plugin-app/utils/index.ts renamed to @fiction/core/plugin-app/utils/index.ts

@@ -1,7 +1,7 @@
 /**
  * @vitest-environment happy-dom
  */
-import { createTestUtils } from '@factor/api/test-utils/init'
+import { createTestUtils } from '@fiction/core/test-utils/init'
 import { afterAll, describe, expect, it, vi } from 'vitest'
 import { getTestEmail, snap } from '../../test-utils'
 import type { User } from '../types'

@factor/api/plugin-app/utils/preload.ts renamed to @fiction/core/plugin-app/utils/preload.ts

@@ -1,5 +1,5 @@
 import bcrypt from 'bcrypt'
-import { createTestUtils } from '@factor/api/test-utils/init'
+import { createTestUtils } from '@fiction/core/test-utils/init'
 
 import { describe, expect, it, vi } from 'vitest'
 import type { User } from '../types'

@factor/api/plugin-app/utils/vitePluginMarkdown.ts renamed to @fiction/core/plugin-app/utils/vitePluginMarkdown.ts

@@ -1,4 +1,4 @@
-// import { FullUser } from "@factor/api"
+// import { FullUser } from "@fiction/core"
 import { beforeAll, describe, expect, it, vi } from 'vitest'
 import type { TestUtils } from '../../test-utils/init'
 import { createTestUtils } from '../../test-utils/init'

@factor/api/plugin-aws/index.ts renamed to @fiction/core/plugin-aws/index.ts

@@ -1,4 +1,4 @@
-import { createTestUtils } from '@factor/api/test-utils/init'
+import { createTestUtils } from '@fiction/core/test-utils/init'
 import { afterAll, describe, expect, it } from 'vitest'
 import { getTestEmail } from '../../test-utils'
 

@factor/api/plugin-build/blank.ts renamed to @fiction/core/plugin-build/blank.ts

@@ -1,5 +1,5 @@
 import path from 'node:path'
-import { FactorUi } from '@factor/ui'
+import { FactorUi } from '@fiction/ui'
 import { version as factorVersion } from '../package.json'
 import type { FactorObject, FactorPlugin } from '../plugin'
 import type { vue } from '../utils'

@factor/api/plugin-build/index.ts renamed to @fiction/core/plugin-build/index.ts

@@ -3,7 +3,7 @@
  */
 
 import { beforeAll, describe, expect, it } from 'vitest'
-import { vue } from '@factor/api'
+import { vue } from '@fiction/core'
 import { defineComponent } from 'vue'
 import { useService } from '../inject'
 import { Obj } from '../obj'

@factor/api/plugin-build/plugin-bundle.ts renamed to @fiction/core/plugin-build/plugin-bundle.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type { User } from '@factor/api/plugin-user'
+import type { User } from '@fiction/core/plugin-user'
 import { vue } from '../libraries'
 import { createTestUtils } from '../../test-utils/init'
 

@factor/api/plugin-build/plugin-release.ts renamed to @fiction/core/plugin-build/plugin-release.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { WriteBuffer } from '@factor/api/utils/buffer'
+import { WriteBuffer } from '@fiction/core/utils/buffer'
 import { waitFor } from '../utils'
 
 describe('buffer', () => {

@factor/api/plugin-build/utils.ts renamed to @fiction/core/plugin-build/utils.ts

@@ -2,7 +2,7 @@
  * @vitest-environment happy-dom
  */
 import { describe, expect, it } from 'vitest'
-import { fetchAdvanced } from '@factor/api/utils/fetch'
+import { fetchAdvanced } from '@fiction/core/utils/fetch'
 
 describe('fetch', () => {
   it('has window and fetch', () => {

@factor/api/plugin-cache/__endpoints.ts renamed to @fiction/core/plugin-cache/__endpoints.ts

@@ -1,7 +1,7 @@
 import path from 'node:path'
 import { Buffer } from 'node:buffer'
 import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { MainFile } from '@factor/api/plugin-env'
+import type { MainFile } from '@fiction/core/plugin-env'
 import type { ExecaChildProcess } from 'execa'
 import { execaCommand } from 'execa'
 import { executeCommand, getMainFilePath, importIfExists } from '../nodeUtils'
@@ -17,7 +17,7 @@ describe('node utils', () => {
   })
 
   it('has right cwd', async () => {
-    expect(cwd).toMatchInlineSnapshot(`"/Users/arpowers/Projects/core/@factor/www"`)
+    expect(cwd).toMatchInlineSnapshot(`"/Users/arpowers/Projects/core/@fiction/www"`)
   })
   it('gets correct main file path', async () => {
     const filePath = getMainFilePath({ cwd })

@factor/api/plugin-cache/fly.redis.toml renamed to @fiction/core/plugin-cache/fly.redis.toml

@@ -1,6 +1,6 @@
 import { beforeAll, describe, expect, it } from 'vitest'
-import type { TestUtils } from '@factor/api/test-utils'
-import { createTestUtils } from '@factor/api/test-utils'
+import type { TestUtils } from '@fiction/core/test-utils'
+import { createTestUtils } from '@fiction/core/test-utils'
 import type { Processor } from '../processors'
 import { ObjectProcessor, Shortcodes } from '../processors'
 

@factor/api/plugin-cache/index.ts renamed to @fiction/core/plugin-cache/index.ts

@@ -1,7 +1,7 @@
 // @unocss-include
-import type { FactorPluginSettings } from '@factor/api'
-import { FactorPlugin } from '@factor/api'
-import type { FactorAdmin, FactorAdminSettings } from '@factor/plugin-admin'
+import type { FactorPluginSettings } from '@fiction/core'
+import { FactorPlugin } from '@fiction/core'
+import type { FactorAdmin, FactorAdminSettings } from '@fiction/plugin-admin'
 
 export type BaseAdminPluginSettings = FactorAdminSettings & { factorAdmin: FactorAdmin }
 

@factor/api/plugin-cache/types.ts renamed to @fiction/core/plugin-cache/types.ts

@@ -1,12 +1,12 @@
 {
   "dependencies": {
-    "@factor/api": "workspace:*",
-    "@factor/plugin-sites": "workspace:*"
+    "@fiction/core": "workspace:*",
+    "@fiction/plugin-sites": "workspace:*"
   },
   "gitHead": "b257411e1c6c32b52b444cc6f1518bf1bee1e480",
   "license": "MIT",
   "main": "index.ts",
-  "name": "@factor/plugin-admin-index",
+  "name": "@fiction/plugin-admin-index",
   "publishConfig": {
     "access": "public"
   },

@factor/api/plugin-db/dbExtend.ts renamed to @fiction/core/plugin-db/dbExtend.ts

@@ -2,10 +2,10 @@ import type {
   FactorApp,
   FactorPluginSettings,
   FactorRouter,
-} from '@factor/api'
+} from '@fiction/core'
 import {
   FactorPlugin,
-} from '@factor/api'
+} from '@fiction/core'
 import type { FactorAdmin, FactorAdminSettings } from '.'
 
 export type AdminPluginSettings = {

@factor/api/plugin-db/endpoint.ts renamed to @fiction/core/plugin-db/endpoint.ts

@@ -12,11 +12,11 @@ import type {
   FactorUser,
   PluginSetupArgs,
   ServiceList,
-} from '@factor/api'
-import type { FactorMonitor } from '@factor/plugin-monitor'
-import { FactorPlugin, Query, safeDirname, vue } from '@factor/api'
-import type { FactorAdminPluginIndex } from '@factor/plugin-admin-index'
-import type { FactorAi } from '@factor/plugin-ai'
+} from '@fiction/core'
+import type { FactorMonitor } from '@fiction/plugin-monitor'
+import { FactorPlugin, Query, safeDirname, vue } from '@fiction/core'
+import type { FactorAdminPluginIndex } from '@fiction/plugin-admin-index'
+import type { FactorAi } from '@fiction/plugin-ai'
 
 export type AdminEngineViewEntry = EngineViewEntry<{
   layoutFormat?: 'full' | 'standard'