Skip to content

Commit

Permalink
refactor!(define-models): rename defineModel to defineModels
Browse files Browse the repository at this point in the history
  • Loading branch information
sxzz committed Apr 3, 2023
1 parent 704d805 commit b7b499b
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
16 changes: 8 additions & 8 deletions packages/define-models/src/core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ import type {
VariableDeclaration,
} from '@babel/types'

export function transformDefineModel(
export function transformDefineModels(
code: string,
id: string,
version: number,
unified: boolean
) {
let hasDefineProps = false
let hasDefineEmits = false
let hasDefineModel = false
let hasDefineModels = false

let propsTypeDecl: TSInterfaceBody | TSTypeLiteral | undefined
let propsDestructureDecl: Node | undefined
Expand Down Expand Up @@ -114,7 +114,7 @@ export function transformDefineModel(
return true
}

function processDefineModel(
function processDefineModels(
node: Node,
declId?: LVal,
kind?: VariableDeclaration['kind']
Expand All @@ -123,10 +123,10 @@ export function transformDefineModel(
else if (isCallOf(node, DEFINE_MODELS_DOLLAR)) mode = 'reactivity-transform'
else return false

if (hasDefineModel) {
if (hasDefineModels) {
throw new SyntaxError(`duplicate ${DEFINE_MODELS}() call`)
}
hasDefineModel = true
hasDefineModels = true
modelDecl = node

const propsTypeDeclRaw = node.typeParameters?.params[0]
Expand Down Expand Up @@ -516,7 +516,7 @@ export function transformDefineModel(
}

if (
processDefineModel(node.expression) &&
processDefineModels(node.expression) &&
mode === 'reactivity-transform'
)
s.remove(node.start! + setupOffset, node.end! + setupOffset)
Expand All @@ -530,7 +530,7 @@ export function transformDefineModel(
processDefinePropsOrEmits(decl.init, decl.id)

if (
processDefineModel(decl.init, decl.id, node.kind) &&
processDefineModels(decl.init, decl.id, node.kind) &&
mode === 'reactivity-transform'
) {
if (left === 1) {
Expand Down Expand Up @@ -583,7 +583,7 @@ export function transformDefineModel(
// if (!defaults) return { defaultsAst }
rewriteMacros()

if (mode === 'reactivity-transform' && hasDefineModel)
if (mode === 'reactivity-transform' && hasDefineModels)
processAssignModelVariable()

return getTransformResult(s, id)
Expand Down
4 changes: 2 additions & 2 deletions packages/define-models/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
detectVueVersion,
normalizePath,
} from '@vue-macros/common'
import { transformDefineModel } from './core'
import { transformDefineModels } from './core'
import {
emitHelperCode,
emitHelperId,
Expand Down Expand Up @@ -77,7 +77,7 @@ export default createUnplugin<Options | undefined, false>(
},

transform(code, id) {
return transformDefineModel(code, id, options.version, options.unified)
return transformDefineModels(code, id, options.version, options.unified)
},
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/define-models/tests/fixtures.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { testFixtures } from '@vue-macros/test-utils'
import { describe } from 'vitest'
import { transformDefineModel } from '../src/core'
import { transformDefineModels } from '../src/core'

describe('fixtures', async () => {
await testFixtures(
Expand All @@ -10,7 +10,7 @@ describe('fixtures', async () => {
}),
(args, id, code) => {
const version = id.includes('vue2') ? 2 : 3
return transformDefineModel(code, id, version, true)?.code
return transformDefineModels(code, id, version, true)?.code
}
)
})
8 changes: 4 additions & 4 deletions packages/macros/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createCombinePlugin } from 'unplugin-combine'
import VueBetterDefine from '@vue-macros/better-define'
import VueDefineModel from '@vue-macros/define-models'
import VueDefineModels from '@vue-macros/define-models'
import VueDefineOptions from 'unplugin-vue-define-options'
import VueDefineProps from '@vue-macros/define-props'
import VueDefinePropsRefs from '@vue-macros/define-props-refs'
Expand All @@ -21,7 +21,7 @@ import { Devtools } from '@vue-macros/devtools'
import type { UnpluginInstance } from 'unplugin'
import type { OptionsPlugin, Plugin, PluginType } from 'unplugin-combine'
import type { Options as OptionsBetterDefine } from '@vue-macros/better-define'
import type { Options as OptionsDefineModel } from '@vue-macros/define-models'
import type { Options as OptionsDefineModels } from '@vue-macros/define-models'
import type { Options as OptionsDefineOptions } from 'unplugin-vue-define-options'
import type { Options as OptionsDefineProps } from '@vue-macros/define-props'
import type { Options as OptionsDefinePropsRefs } from '@vue-macros/define-props-refs'
Expand All @@ -39,7 +39,7 @@ import type { Options as OptionsSingleDefine } from '@vue-macros/single-define'

export interface FeatureOptionsMap {
betterDefine: OptionsBetterDefine
defineModels: OptionsDefineModel
defineModels: OptionsDefineModels
defineOptions: OptionsDefineOptions
defineProps: OptionsDefineProps
definePropsRefs: OptionsDefinePropsRefs
Expand Down Expand Up @@ -225,7 +225,7 @@ export default createCombinePlugin<Options | undefined>(
resolvePlugin(VueDefinePropsRefs, framework, options.definePropsRefs),
resolvePlugin(VueExportProps, framework, options.exportProps),
resolvePlugin(VueShortEmits, framework, options.shortEmits),
resolvePlugin(VueDefineModel, framework, options.defineModels),
resolvePlugin(VueDefineModels, framework, options.defineModels),
resolvePlugin(VueDefineSlots, framework, options.defineSlots),
resolvePlugin(
VueReactivityTransform,
Expand Down
4 changes: 2 additions & 2 deletions packages/volar/src/define-models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { addEmits, addProps, getVueLibraryName } from './common'
import type { Segment } from 'muggle-string'
import type { Sfc, VueLanguagePlugin } from '@volar/vue-language-core'

function transformDefineModel({
function transformDefineModels({
codes,
sfc,
typeArg,
Expand Down Expand Up @@ -117,7 +117,7 @@ const plugin: VueLanguagePlugin = ({
const unified =
(vueVersion < 3 && vueCompilerOptions?.defineModels?.unified) ?? true

transformDefineModel({
transformDefineModels({
codes: embeddedFile.content,
sfc,
typeArg,
Expand Down

0 comments on commit b7b499b

Please sign in to comment.