@drawcall/market 0.1.35 → 0.1.37

package/tests/install-layout.test.ts

@@ -5,6 +5,7 @@ import * as path from 'node:path'
 import test from 'node:test'
 import { zipSync } from 'fflate'
 import { findInstallRoot, install } from '../src/install.js'
+import { MARKET_LOCK_PATH } from '../src/market-lock.js'
 
 const textEncoder = new TextEncoder()
 
@@ -53,6 +54,7 @@ test('install writes zip files into the package root', async () => {
     ],
     npmDependencies: {},
     skillDependencies: {},
+    warnings: [],
   })
   assert.equal(
     await fs.readFile(path.join(appRoot, 'public', 'humanoid-animation', 'idle-loop.glb'), 'utf-8'),
@@ -64,6 +66,15 @@ test('install writes zip files into the package root', async () => {
   )
   assert.equal(await fs.readFile(path.join(appRoot, 'README.md'), 'utf-8'), 'project readme\n')
   assert.equal(await exists(path.join(cwd, 'src', 'idle-loop', 'public')), false)
+
+  const lock = JSON.parse(await fs.readFile(path.join(appRoot, MARKET_LOCK_PATH), 'utf-8')) as {
+    assets: Record<string, { version: string; files: Record<string, { sha256: string }> }>
+  }
+  assert.equal(lock.assets['idle-loop'].version, '1.0.0')
+  assert.equal(
+    typeof lock.assets['idle-loop'].files['public/humanoid-animation/idle-loop.glb'].sha256,
+    'string',
+  )
 })
 
 test('install rejects zip paths that escape through parent segments', async () => {
@@ -149,6 +160,112 @@ test('install runs the skills runner per dependency, resolving local paths again
     'web-design-guidelines': 'vercel-labs/agent-skills/tree/main/skills/web-design-guidelines',
     'local-skill': './public/skills/local-skill',
   })
+  assert.deepEqual(result.warnings, [])
+})
+
+test('install saves top-level assets according to provider policy', async () => {
+  const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'market-save-policy-'))
+  await fs.writeFile(path.join(tempDir, 'package.json'), '{}\n')
+
+  await install(
+    clientWithZip({
+      'public/model/chair.glb': textEncoder.encode('chair'),
+      'src/template.ts': textEncoder.encode('export {}\n'),
+    }),
+    {
+      assets: [
+        {
+          name: 'chair',
+          type: 'model',
+          version: '1.2.0',
+          description: null,
+          npmDependencies: {},
+          assetDependencies: {},
+          skillDependencies: {},
+        },
+        {
+          name: 'starter-template',
+          type: 'template',
+          version: '2.0.0',
+          description: null,
+          npmDependencies: {},
+          assetDependencies: {},
+          skillDependencies: {},
+        },
+      ],
+      npmDependencies: {},
+      skillDependencies: {},
+    },
+    {
+      cwd: tempDir,
+      rootRequests: [
+        { name: 'chair', range: '*', saveRange: '^1.2.0', save: true },
+        { name: 'starter-template', range: '*', saveRange: '^2.0.0', save: true },
+      ],
+      installMetadata: {
+        template: {
+          saveOnInstall: false,
+          readAssetDependenciesFromPackageJson: true,
+          omitUnchangedInstalledFilesOnUpload: true,
+        },
+      },
+    },
+  )
+
+  const pkg = JSON.parse(await fs.readFile(path.join(tempDir, 'package.json'), 'utf-8')) as {
+    assetDependencies: Record<string, string>
+  }
+  assert.deepEqual(pkg.assetDependencies, { chair: '^1.2.0' })
+})
+
+test('install skips existing changed files unless force is set', async () => {
+  const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'market-conflict-'))
+  await fs.mkdir(path.join(tempDir, 'public', 'model'), { recursive: true })
+  await fs.writeFile(path.join(tempDir, 'package.json'), '{}\n')
+  await fs.writeFile(path.join(tempDir, 'public', 'model', 'chair.glb'), 'local edit')
+
+  const resolution = {
+    assets: [
+      {
+        name: 'chair',
+        type: 'model',
+        version: '1.0.0',
+        description: null,
+        npmDependencies: {},
+        assetDependencies: {},
+        skillDependencies: {},
+      },
+    ],
+    npmDependencies: {},
+    skillDependencies: {},
+  }
+
+  const skipped = await install(
+    clientWithZip({
+      'public/model/chair.glb': textEncoder.encode('market bytes'),
+    }),
+    resolution,
+    { cwd: tempDir },
+  )
+
+  assert.equal(await fs.readFile(path.join(tempDir, 'public', 'model', 'chair.glb'), 'utf-8'), 'local edit')
+  assert.match(skipped.warnings[0], /Skipped public\/model\/chair\.glb/u)
+  assert.deepEqual(skipped.assets[0].files, [])
+
+  const forced = await install(
+    clientWithZip({
+      'public/model/chair.glb': textEncoder.encode('market bytes'),
+    }),
+    resolution,
+    { cwd: tempDir, force: true },
+  )
+
+  assert.equal(
+    await fs.readFile(path.join(tempDir, 'public', 'model', 'chair.glb'), 'utf-8'),
+    'market bytes',
+  )
+  assert.deepEqual(forced.warnings, [])
+  assert.deepEqual(forced.assets[0].files, ['public/model/chair.glb'])
 })
 
 test('findInstallRoot uses the nearest package.json, not the monorepo root', async () => {

package/tests/list-command.test.ts

@@ -0,0 +1,76 @@
+import assert from 'node:assert/strict'
+import * as fs from 'node:fs/promises'
+import * as os from 'node:os'
+import * as path from 'node:path'
+import test from 'node:test'
+import { listInstalledAssets } from '../src/commands/list.js'
+import { MARKET_LOCK_PATH } from '../src/market-lock.js'
+
+test('listInstalledAssets reads the nearest project lockfile', async () => {
+  const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'market-list-'))
+  const appRoot = path.join(tempDir, 'app')
+  const cwd = path.join(appRoot, 'src', 'feature')
+  await fs.mkdir(path.join(appRoot, '.drawcall'), { recursive: true })
+  await fs.mkdir(cwd, { recursive: true })
+  await fs.writeFile(path.join(appRoot, 'package.json'), '{}\n')
+  await fs.writeFile(
+    path.join(appRoot, MARKET_LOCK_PATH),
+    JSON.stringify(
+      {
+        version: 1,
+        assets: {
+          'wooden-chair': {
+            version: '1.2.0',
+            type: 'model',
+            files: {
+              'public/models/wooden-chair.glb': { sha256: 'abc' },
+            },
+          },
+          'forest-sky': {
+            version: '1.0.0',
+            type: 'environment',
+            files: {
+              'public/environment/forest-sky.hdr': { sha256: 'def' },
+              'public/environment/forest-sky-background.webp': { sha256: 'ghi' },
+            },
+          },
+        },
+      },
+      null,
+      2,
+    ) + '\n',
+  )
+
+  assert.deepEqual(await listInstalledAssets(cwd), {
+    projectRoot: appRoot,
+    lockPath: path.join(appRoot, MARKET_LOCK_PATH),
+    assets: [
+      {
+        name: 'forest-sky',
+        version: '1.0.0',
+        type: 'environment',
+        files: [
+          'public/environment/forest-sky-background.webp',
+          'public/environment/forest-sky.hdr',
+        ],
+      },
+      {
+        name: 'wooden-chair',
+        version: '1.2.0',
+        type: 'model',
+        files: ['public/models/wooden-chair.glb'],
+      },
+    ],
+  })
+})
+
+test('listInstalledAssets returns an empty inventory when no lockfile exists', async () => {
+  const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'market-list-empty-'))
+  await fs.writeFile(path.join(tempDir, 'package.json'), '{}\n')
+
+  assert.deepEqual(await listInstalledAssets(tempDir), {
+    projectRoot: tempDir,
+    lockPath: path.join(tempDir, MARKET_LOCK_PATH),
+    assets: [],
+  })
+})

package/tests/output.test.ts

@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict'
 import test from 'node:test'
-import { assetSearchResultLine, installResult } from '../src/output.js'
+import { assetSearchResultLine, installResult, listResult } from '../src/output.js'
 
 test('assetSearchResultLine prints the full description', () => {
   const description =
@@ -47,6 +47,7 @@ test('installResult prints asset type, file tree, and npm list', () => {
       ],
       npmDependencies: { '@react-three/drei': 'latest' },
       skillDependencies: {},
+      warnings: [],
     }),
     `Installed:
 - wooden-chair@1.2.0 (model)
@@ -87,9 +88,15 @@ test('installResult attaches each post-install note under its asset', () => {
         ],
         npmDependencies: {},
         skillDependencies: {},
+        warnings: [],
       },
       {
-        model: 'Load the model.',
+        model: {
+          installMessage: 'Load the model.',
+          saveOnInstall: true,
+          readAssetDependenciesFromPackageJson: false,
+          omitUnchangedInstalledFilesOnUpload: false,
+        },
         // sound-effect intentionally omitted -> no note for `beep`.
       },
     ),
@@ -107,8 +114,16 @@ test('installResult word-wraps a long note with a hanging indent', () => {
       assets: [{ name: 'thing', type: 'model', version: '1.0.0', description: null, files: [] }],
       npmDependencies: {},
       skillDependencies: {},
+      warnings: [],
+    },
+    {
+      model: {
+        installMessage: message,
+        saveOnInstall: true,
+        readAssetDependenciesFromPackageJson: false,
+        omitUnchangedInstalledFilesOnUpload: false,
+      },
     },
-    { model: message },
   )
 
   assert.equal(
@@ -137,6 +152,7 @@ test('installResult lists installed skills with their source', () => {
         'web-design-guidelines': 'vercel-labs/agent-skills/tree/main/skills/web-design-guidelines',
         'local-skill': '/abs/public/skills/local-skill',
       },
+      warnings: [],
     }),
     `Installed:
 - wooden-chair@1.2.0 (model)
@@ -160,6 +176,7 @@ test('installResult shows each installed asset description', () => {
       ],
       npmDependencies: {},
       skillDependencies: {},
+      warnings: [],
     }),
     `Installed:
 - wooden-chair@1.2.0 (model)
@@ -167,3 +184,52 @@ test('installResult shows each installed asset description', () => {
                placement for room scenes.`,
   )
 })
+
+test('listResult prints installed assets with file trees', () => {
+  assert.equal(
+    listResult({
+      projectRoot: '/project',
+      lockPath: '/project/.drawcall/market-lock.json',
+      assets: [
+        {
+          name: 'wooden-chair',
+          type: 'model',
+          version: '1.2.0',
+          files: ['public/models/wooden-chair.glb'],
+        },
+        {
+          name: 'forest-sky',
+          type: 'environment',
+          version: '1.0.0',
+          files: [
+            'public/environment/forest-sky-background.webp',
+            'public/environment/forest-sky.hdr',
+          ],
+        },
+      ],
+    }),
+    `Installed assets: 2
+- wooden-chair@1.2.0 (model)
+  files:
+    public
+    └─ models
+       └─ wooden-chair.glb
+- forest-sky@1.0.0 (environment)
+  files:
+    public
+    └─ environment
+       ├─ forest-sky-background.webp
+       └─ forest-sky.hdr`,
+  )
+})
+
+test('listResult handles an empty inventory', () => {
+  assert.equal(
+    listResult({
+      projectRoot: '/project',
+      lockPath: '/project/.drawcall/market-lock.json',
+      assets: [],
+    }),
+    'No installed assets found.',
+  )
+})