@threlte/gltf 3.0.4 → 3.0.6

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @threlte/gltf
 
+## 3.0.6
+
+### Patch Changes
+
+- 766701b: Fixed -p flag collision between --printwidth and --precision
+- 766701b: Fixed --printwidth flag being ignored
+- 766701b: Fixed ReferenceError crash when using --degrade flag
+
+## 3.0.5
+
+### Patch Changes
+
+- bd24a8a: Fix prettier-plugin-svelte resolution error when running via npx
+- 3c951cc: Auto-detect Draco compression from GLTF metadata and include useDraco() in generated components automatically
+
 ## 3.0.4
 
 ### Patch Changes

package/cli.js

@@ -47,7 +47,7 @@ const cli = meow(
       keepnames: { type: 'boolean', shortFlag: 'k' },
       keepgroups: { type: 'boolean', shortFlag: 'K' },
       shadows: { type: 'boolean', shortFlag: 's' },
-      printwidth: { type: 'number', shortFlag: 'p', default: 120 },
+      printwidth: { type: 'number', shortFlag: 'w', default: 120 },
       meta: { type: 'boolean', shortFlag: 'm' },
       precision: { type: 'number', shortFlag: 'p', default: 2 },
       isolated: { type: 'boolean', shortFlag: 'i', default: false },
@@ -62,6 +62,7 @@ const cli = meow(
       simplify: { type: 'boolean', shortFlag: 'S', default: false },
       keepmeshes: { type: 'boolean', shortFlag: 'j', default: false },
       keepmaterials: { type: 'boolean', shortFlag: 'M', default: false },
+      format: { type: 'string', shortFlag: 'f', default: 'webp' },
       ratio: { type: 'number', default: 0.75 },
       error: { type: 'number', default: 0.001 },
       debug: { type: 'boolean', shortFlag: 'D' }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threlte/gltf",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "description": "GLTF to Threlte converter",
   "type": "module",
   "keywords": [

package/src/index.js

@@ -2,6 +2,7 @@ import 'jsdom-global'
 import fs from 'node:fs/promises'
 import path from 'node:path'
 import * as prettier from 'prettier'
+import * as prettierPluginSvelte from 'prettier-plugin-svelte'
 import { transform } from './utils/transform.js'
 import { parse } from './utils/parser.js'
 import { GLTFLoader } from './bin/GLTFLoader.js'
@@ -38,9 +39,9 @@ export default async function (file, output, options) {
     singleQuote: true,
     trailingComma: 'es5',
     semi: false,
-    printWidth: 100,
+    printWidth: options.printwidth ?? 100,
     parser: 'svelte',
-    plugins: ['prettier-plugin-svelte'],
+    plugins: [prettierPluginSvelte],
     overrides: [
       {
         files: '*.svelte',

package/src/utils/Options.d.ts

@@ -19,4 +19,14 @@ export type Options = {
   ratio?: number
   error?: number
   debug?: boolean
+  keepmeshes?: boolean
+  keepmaterials?: boolean
+  format?: string
+  degrade?: string
+  degraderesolution?: number
+  console?: boolean
+  header?: string
+  showLog?: (log: string) => void
+  timeout?: number
+  delay?: number
 }

package/src/utils/parser.js

@@ -53,7 +53,7 @@ export function parse(fileName, gltf, options = {}) {
     }
 
     if (child.geometry) {
-      const key = child.geometry.uuid + child.material?.name ?? ''
+      const key = child.geometry.uuid + (child.material?.name ?? '')
       if (!duplicates.geometries[key]) {
         let name = (child.name || 'Part').replace(/[^a-zA-Z]/g, '')
         name = name.charAt(0).toUpperCase() + name.slice(1)
@@ -77,7 +77,7 @@ export function parse(fileName, gltf, options = {}) {
   }
 
   function sanitizeName(name) {
-    return isVarName(name) ? `.${name}` : `['${name}']`
+    return isVarName(name) ? `.${name}` : `['${name.replace(/\\/g, '\\\\').replace(/'/g, "\\'")}']`
   }
 
   const rNbr = (number) => {
@@ -484,8 +484,12 @@ export function parse(fileName, gltf, options = {}) {
   // 2nd pass to eliminate hard to swat left-overs
   const scene = printThrelte(gltf.scene)
 
+  const hasDraco =
+    gltf.parser?.json?.extensionsUsed?.includes('KHR_draco_mesh_compression') ||
+    gltf.parser?.json?.extensionsRequired?.includes('KHR_draco_mesh_compression')
+
   const useGltfOptions = {
-    draco: options.transform || options.draco
+    draco: options.transform || options.draco || hasDraco
   }
 
   const imports = `
@@ -524,7 +528,7 @@ ${parseExtras(gltf.parser.json.asset && gltf.parser.json.asset.extras)}-->
 ${
   options.preload
     ? `
-<script context="module"${options.types ? ' lang="ts"' : ''}>
+<script module${options.types ? ' lang="ts"' : ''}>
 	${imports}
 
 	${options.types ? printThrelteTypes(objects, animations) : ''}

package/src/utils/transform.js

@@ -83,7 +83,7 @@ export async function transform(file, output, config = {}) {
         encoder: sharp,
         pattern: new RegExp(`^(?=${config.degrade}).*$`),
         targetFormat: config.format,
-        resize: [degradeResolution, degradeResolution]
+        resize: [config.degraderesolution ?? 512, config.degraderesolution ?? 512]
       }),
       textureCompress({
         encoder: sharp,