support @base/object module

cocos/2d/assembler/graphics/types.ts

@@ -23,7 +23,7 @@
  THE SOFTWARE.
 */
 
-import { ccenum } from '../../../core';
+import { ccenum } from '@base/object';
 
 /**
  * @en Enum for LineCap.

cocos/2d/components/label.ts

@@ -27,9 +27,10 @@ import { ccclass, help, executionOrder, menu, tooltip, displayOrder, visible, mu
 import { BYTEDANCE, EDITOR, JSB } from 'internal:constants';
 import { minigame } from 'pal/minigame';
 import { cclegacy } from '@base/global';
+import { ccenum } from '@base/object';
 import { BitmapFont, Font, SpriteFrame } from '../assets';
 import { ImageAsset, Texture2D } from '../../asset/assets';
-import { ccenum, Color, Vec2 } from '../../core';
+import { Color, Vec2 } from '../../core';
 import { IBatcher } from '../renderer/i-batcher';
 import { FontAtlas } from '../assets/bitmap-font';
 import { CanvasPool, ISharedLabelData, LetterRenderTexture } from '../assembler/label/font-utils';

cocos/2d/components/mask.ts

@@ -27,7 +27,8 @@ import { ccclass, help, executionOrder, menu, tooltip, displayOrder, type, visib
 import { JSB } from 'internal:constants';
 import { warnID, error } from '@base/debug';
 import { cclegacy } from '@base/global';
-import { clamp, Color, Mat4, Vec2, Vec3, ccenum } from '../../core';
+import { ccenum } from '@base/object';
+import { clamp, Color, Mat4, Vec2, Vec3 } from '../../core';
 import { Graphics } from './graphics';
 import { TransformBit } from '../../scene-graph/node-enum';
 import { Stage } from '../renderer/stencil-manager';

cocos/2d/components/rich-text.ts

@@ -28,9 +28,10 @@ import { DEBUG, DEV, EDITOR } from 'internal:constants';
 import { assert, warnID } from '@base/debug';
 import { cclegacy } from '@base/global';
 import { js } from '@base/utils';
+import { CCObject } from '@base/object';
 import { Font, SpriteAtlas, TTFFont, SpriteFrame } from '../assets';
 import { EventTouch } from '../../input/types';
-import { Color, Vec2, CCObject, Size } from '../../core';
+import { Color, Vec2, Size } from '../../core';
 import { BASELINE_RATIO, fragmentText, isUnicodeCJK, isUnicodeSpace, getEnglishWordPartAtFirst, getEnglishWordPartAtLast } from '../utils/text-utils';
 import { HtmlTextParser, IHtmlTextParserResultObj, IHtmlTextParserStack } from '../utils/html-text-parser';
 import { Node } from '../../scene-graph';

cocos/2d/components/sprite.ts

@@ -27,9 +27,10 @@ import { ccclass, help, executionOrder, menu, tooltip, displayOrder, type, range
 import { BUILD, EDITOR } from 'internal:constants';
 import { warn } from '@base/debug';
 import { cclegacy } from '@base/global';
+import { ccenum } from '@base/object';
 import { SpriteAtlas } from '../assets/sprite-atlas';
 import { SpriteFrame } from '../assets/sprite-frame';
-import { Vec2, ccenum, clamp } from '../../core';
+import { Vec2, clamp } from '../../core';
 import { IBatcher } from '../renderer/i-batcher';
 import { UIRenderer, InstanceMaterialType } from '../framework/ui-renderer';
 import { PixelFormat } from '../../asset/assets/asset-enum';

cocos/2d/framework/canvas.ts

@@ -26,9 +26,10 @@
 import { ccclass, help, disallowMultiple, executeInEditMode, executionOrder, menu, tooltip, type, serializable } from 'cc.decorator';
 import { EDITOR } from 'internal:constants';
 import { cclegacy } from '@base/global';
+import { Enum } from '@base/object';
 import { Camera } from '../../misc/camera-component';
 import { Widget } from '../../ui/widget';
-import { Vec3, screen, Enum, visibleRect } from '../../core';
+import { Vec3, screen, visibleRect } from '../../core';
 import { view } from '../../ui/view';
 import { RenderRoot2D } from './render-root-2d';
 import { NodeEventType } from '../../scene-graph/node-event';

cocos/2d/framework/ui-renderer.ts

@@ -26,7 +26,8 @@ import { DEBUG, EDITOR, JSB } from 'internal:constants';
 import { ccclass, executeInEditMode, requireComponent, tooltip, type, displayOrder, serializable, override, visible, displayName, disallowAnimation } from 'cc.decorator';
 import { assert } from '@base/debug';
 import { cclegacy } from '@base/global';
-import { Color, ccenum } from '../../core';
+import { ccenum } from '@base/object';
+import { Color } from '../../core';
 import { builtinResMgr } from '../../asset/asset-manager';
 import { Material } from '../../asset/assets';
 import { BlendFactor, BlendOp, ColorMask } from '../../gfx';

cocos/3d/assets/skeleton.jsb.ts

@@ -22,7 +22,8 @@
  THE SOFTWARE.
 */
 
-import { CCString, Mat4 } from '../../core';
+import { CCString } from '@base/object';
+import { Mat4 } from '../../core';
 import { cclegacy } from '@base/global';
 import { DataPoolManager } from '../skeletal-animation/data-pool-manager';
 import { Asset } from '../../asset/assets/asset';

cocos/3d/assets/skeleton.ts

@@ -24,7 +24,8 @@
 
 import { ccclass, type, serializable } from 'cc.decorator';
 import { cclegacy } from '@base/global';
-import { CCString, Mat4, murmurhash2_32_gc } from '../../core';
+import { CCString } from '@base/object';
+import { Mat4, murmurhash2_32_gc } from '../../core';
 import type { DataPoolManager } from '../skeletal-animation/data-pool-manager';
 import { Asset } from '../../asset/assets/asset';
 

cocos/3d/framework/mesh-renderer.ts

@@ -27,10 +27,11 @@ import { displayOrder, group, range } from 'cc.decorator';
 import { warnID } from '@base/debug';
 import { assertIsTrue } from '@base/debug/internal';
 import { cclegacy } from '@base/global';
+import { Enum, CCBoolean, CCFloat, CCInteger } from '@base/object';
 import { Texture2D, TextureCube } from '../../asset/assets';
 import { Material } from '../../asset/assets/material';
 import { Mesh } from '../assets/mesh';
-import { Vec4, Enum, CCBoolean, CCFloat, _decorator, CCInteger, EventTarget } from '../../core';
+import { Vec4, _decorator, EventTarget } from '../../core';
 import { scene } from '../../render-scene';
 import { MorphModel } from '../models/morph-model';
 import { Root } from '../../root';

cocos/3d/lights/directional-light-component.ts

@@ -25,9 +25,10 @@
 
 import { cclegacy } from '@base/global';
 import { warnID } from '@base/debug';
+import { CCBoolean, CCFloat, CCInteger } from '@base/object';
 import { Light } from './light-component';
 import { scene } from '../../render-scene';
-import { clamp, CCBoolean, CCFloat, _decorator, settings, Settings, CCInteger } from '../../core';
+import { clamp, _decorator, settings, Settings } from '../../core';
 import { Camera, PCFType, Shadows, ShadowType, CSMOptimizationMode, CSMLevel } from '../../render-scene/scene';
 import { Root } from '../../root';
 import { MeshRenderer } from '../framework/mesh-renderer';

cocos/3d/lights/light-component.ts

@@ -25,8 +25,9 @@
 
 import { ccclass, tooltip, range, slide, type, displayOrder, serializable, editable } from 'cc.decorator';
 import { cclegacy } from '@base/global';
+import { Enum } from '@base/object';
 import { Component } from '../../scene-graph/component';
-import { Color, Vec3, Enum } from '../../core';
+import { Color, Vec3 } from '../../core';
 import { scene } from '../../render-scene';
 import { Root } from '../../root';
 import { CAMERA_DEFAULT_MASK } from '../../rendering/define';

cocos/3d/lights/point-light-component.ts

@@ -24,10 +24,10 @@
 
 import { ccclass, help, executeInEditMode, menu, tooltip, type, displayOrder, serializable, formerlySerializedAs, editable, rangeMin, range } from 'cc.decorator';
 import { cclegacy } from '@base/global';
+import { CCFloat, CCInteger } from '@base/object';
 import { scene } from '../../render-scene';
 import { Camera, LightType } from '../../render-scene/scene';
 import { Light, PhotometricTerm } from './light-component';
-import { CCFloat, CCInteger } from '../../core';
 
 /**
  * @en The point light component, multiple point lights can be added to one scene.

cocos/3d/lights/ranged-directional-light-component.ts

@@ -19,11 +19,11 @@
 */
 
 import { cclegacy } from '@base/global';
+import { CCInteger } from '@base/object';
 import { Light } from './light-component';
 import { ccclass, help, property, menu, executeInEditMode, formerlySerializedAs, serializable, tooltip, editable, type } from '../../core/data/class-decorator';
 import { Camera, LightType } from '../../render-scene/scene';
 import { scene } from '../../render-scene';
-import { CCInteger } from '../../core';
 import { range } from '../../core/data/decorators';
 
 /**

cocos/3d/lights/sphere-light-component.ts

@@ -25,9 +25,9 @@
 
 import { ccclass, help, executeInEditMode, menu, tooltip, type, displayOrder, serializable, formerlySerializedAs, editable, slide, rangeMin, range } from 'cc.decorator';
 import { cclegacy } from '@base/global';
+import { CCFloat, CCInteger } from '@base/object';
 import { scene } from '../../render-scene';
 import { Light, PhotometricTerm } from './light-component';
-import { CCFloat, CCInteger } from '../../core';
 import { Camera } from '../../render-scene/scene';
 import { Root } from '../../root';
 

cocos/3d/lights/spot-light-component.ts

@@ -23,7 +23,8 @@
  THE SOFTWARE.
 */
 import { cclegacy } from '@base/global';
-import { toRadian, CCBoolean, CCFloat, _decorator } from '../../core';
+import { CCBoolean, CCFloat } from '@base/object';
+import { toRadian, _decorator } from '../../core';
 import { scene } from '../../render-scene';
 import { Light, PhotometricTerm } from './light-component';
 import { Root } from '../../root';

cocos/3d/lod/lodgroup-component.ts

@@ -24,7 +24,8 @@
 import { EDITOR, JSB } from 'internal:constants';
 import { ccclass, editable, executeInEditMode, menu, serializable, type } from 'cc.decorator';
 import { error, warn } from '@base/debug';
-import { Vec3, Mat4, geometry, CCInteger, CCFloat } from '../../core';
+import { CCInteger, CCFloat } from '@base/object';
+import { Vec3, Mat4, geometry } from '../../core';
 import { Node } from '../../scene-graph/node';
 import { Component } from '../../scene-graph/component';
 import { MeshRenderer } from '../framework/mesh-renderer';

cocos/3d/reflection-probe/reflection-probe-component.ts

@@ -24,7 +24,8 @@
 import { ccclass, executeInEditMode, help, menu, playOnFocus, serializable, tooltip, type, visible } from 'cc.decorator';
 import { EDITOR, EDITOR_NOT_IN_PREVIEW } from 'internal:constants';
 import { warn } from '@base/debug';
-import { CCBoolean, CCObject, Color, Enum, Vec3 } from '../../core';
+import { CCBoolean, CCObject, Enum } from '@base/object';
+import { Color, Vec3 } from '../../core';
 
 import { TextureCube } from '../../asset/assets';
 import { scene } from '../../render-scene';

cocos/3d/skinned-mesh-renderer/skinned-mesh-batch-renderer.ts

@@ -27,13 +27,14 @@ import { ccclass, help, executeInEditMode, executionOrder, menu, tooltip, type,
 import { ImageData } from 'pal/image';
 import { warn } from '@base/debug';
 import { cclegacy } from '@base/global';
+import { CCString } from '@base/object';
 import { getWorldTransformUntilRoot } from '../../animation/transform-utils';
 import { Filter, PixelFormat } from '../../asset/assets/asset-enum';
 import { Material } from '../../asset/assets/material';
 import { Mesh } from '../assets/mesh';
 import { Skeleton } from '../assets/skeleton';
 import { Texture2D } from '../../asset/assets/texture-2d';
-import { CCString, Mat4, Vec2, Vec3 } from '../../core';
+import { Mat4, Vec2, Vec3 } from '../../core';
 import { AttributeName, FormatInfos, Format, Type, Attribute, BufferTextureCopy } from '../../gfx';
 import { mapBuffer, readBuffer, writeBuffer } from '../misc/buffer';
 import { SkinnedMeshRenderer } from './skinned-mesh-renderer';

cocos/animation/animation-curve.ts

@@ -24,7 +24,8 @@
 
 import { errorID } from '@base/debug';
 import { cclegacy } from '@base/global';
-import { lerp, Quat, binarySearchEpsilon, ValueType, bezierByTime, BezierControlPoints, easing } from '../core';
+import { ValueType } from '@base/object';
+import { lerp, Quat, binarySearchEpsilon, bezierByTime, BezierControlPoints, easing } from '../core';
 import { ILerpable, isLerpable } from './types';
 import type * as legacy from './legacy-clip-data';
 

cocos/animation/animation-state.ts

@@ -26,11 +26,12 @@ import { EDITOR_NOT_IN_PREVIEW } from 'internal:constants';
 import { cclegacy } from '@base/global';
 import { debug } from '@base/debug';
 import { assertIsTrue } from '@base/debug/internal';
+import { ccenum } from '@base/object';
 import { Node } from '../scene-graph/node';
 import { AnimationClip } from './animation-clip';
 import { Playable } from './playable';
 import { WrapMode, WrappedInfo } from './types';
-import { geometry, ccenum } from '../core';
+import { geometry } from '../core';
 import { AnimationMask } from './marionette/animation-mask';
 import { PoseOutput } from './pose-output';
 import { BlendStateBuffer } from '../3d/skeletal-animation/skeletal-animation-blending';

cocos/animation/marionette/animation-graph-editor-extras-clone-helper.ts

@@ -22,7 +22,7 @@
  THE SOFTWARE.
 */
 
-import { EditorExtendableObject, editorExtrasTag } from '../../core/data/editor-extras-tag';
+import { EditorExtendableObject, editorExtrasTag } from '@base/object';
 
 /**
  * Clones the editor extras from an animation-graph-specific object.

cocos/animation/marionette/graph-debug.ts

@@ -23,7 +23,7 @@
 */
 
 import { EDITOR } from 'internal:constants';
-import { editorExtrasTag } from '../../core';
+import { editorExtrasTag } from '@base/object';
 import { Motion } from './motion';
 
 export const RUNTIME_ID_ENABLED = EDITOR;

cocos/animation/marionette/motion/animation-blend-2d.ts

@@ -23,7 +23,8 @@
 */
 
 import { assertIsTrue } from '@base/debug/internal';
-import { Vec2, _decorator, ccenum, editable } from '../../../core';
+import { ccenum } from '@base/object';
+import { Vec2, _decorator, editable } from '../../../core';
 import { createEval } from '../create-eval';
 import { AnimationBlend, AnimationBlendEval, AnimationBlendItem } from './animation-blend';
 import { BindableNumber, bindOr, VariableType } from '../parametric';

cocos/animation/marionette/motion/animation-blend.ts

@@ -22,7 +22,8 @@
  THE SOFTWARE.
 */
 
-import { _decorator, EditorExtendable, editorExtrasTag } from '../../../core';
+import { editorExtrasTag } from '@base/object';
+import { _decorator, EditorExtendable } from '../../../core';
 import { Motion, MotionEval, MotionPort } from './motion';
 import { createEval } from '../create-eval';
 import { VariableTypeMismatchedError } from '../errors';

cocos/animation/marionette/motion/clip-motion.ts

@@ -22,7 +22,8 @@
  THE SOFTWARE.
 */
 
-import { editorExtrasTag, _decorator, EditorExtendable, editable, serializable } from '../../../core';
+import { editorExtrasTag } from '@base/object';
+import { _decorator, EditorExtendable, editable, serializable } from '../../../core';
 import { additiveSettingsTag, AnimationClip } from '../../animation-clip';
 import { cloneAnimationGraphEditorExtrasFrom } from '../animation-graph-editor-extras-clone-helper';
 import { createEval } from '../create-eval';

cocos/animation/marionette/pose-graph/decorator/input.ts

@@ -2,7 +2,7 @@
 
 import { error } from '@base/debug';
 import { js } from '@base/utils';
-import { PropertyStashInternalFlag } from '../../../../core/data/class-stash';
+import { PropertyStashInternalFlag } from '@base/object';
 import { getOrCreatePropertyStash } from '../../../../core/data/decorators/property';
 import { PoseGraphNodeInputMappingOptions, globalPoseGraphNodeInputManager } from '../foundation/authoring/input-authoring';
 import { PoseGraphType } from '../foundation/type-system';

cocos/animation/marionette/pose-graph/pose-node.ts

@@ -1,6 +1,6 @@
 import { TEST } from 'internal:constants';
 import { assertIsTrue } from '@base/debug/internal';
-import { ccenum } from '../../../core';
+import { ccenum } from '@base/object';
 import { ccclass } from '../../../core/data/decorators';
 import { Pose, PoseTransformSpace } from '../../core/pose';
 import { CLASS_NAME_PREFIX_ANIM } from '../../define';

cocos/animation/marionette/pose-graph/pose-nodes/apply-transform.ts

@@ -1,11 +1,12 @@
 import { EDITOR } from 'internal:constants';
 import { error } from '@base/debug';
+import { ccenum } from '@base/object';
 import { ccclass, editable, range, serializable, type, visible } from '../../../../core/data/decorators';
 import { CLASS_NAME_PREFIX_ANIM } from '../../../define';
 import { PoseNode, PoseTransformSpaceRequirement } from '../pose-node';
 import { AnimationGraphBindingContext, AnimationGraphEvaluationContext } from '../../animation-graph-context';
 import { input } from '../decorator/input';
-import { approx, ccenum, Quat, Vec3 } from '../../../../core';
+import { approx, Quat, Vec3 } from '../../../../core';
 import { TransformHandle } from '../../../core/animation-handle';
 import { poseGraphNodeAppearance, poseGraphNodeCategory } from '../decorator/node';
 import { POSE_GRAPH_NODE_MENU_PREFIX_POSE } from './menu-common';

cocos/animation/marionette/pose-graph/pose-nodes/copy-transform.ts

@@ -1,8 +1,8 @@
 import { EDITOR } from 'internal:constants';
+import { ccenum } from '@base/object';
 import { ccclass, editable, serializable, type } from '../../../../core/data/decorators';
 import { CLASS_NAME_PREFIX_ANIM } from '../../../define';
 import { PoseTransformSpaceRequirement } from '../pose-node';
-import { ccenum } from '../../../../core';
 import { TransformHandle } from '../../../core/animation-handle';
 import { poseGraphNodeAppearance, poseGraphNodeCategory } from '../decorator/node';
 import { POSE_GRAPH_NODE_MENU_PREFIX_POSE } from './menu-common';

cocos/animation/marionette/pose-graph/pose-nodes/ik/two-bone-ik-solver.ts

@@ -1,9 +1,10 @@
 import { EDITOR } from 'internal:constants';
 import { assertIsTrue } from '@base/debug/internal';
+import { ccenum } from '@base/object';
 import { ccclass, editable, serializable, type, visible } from '../../../../../core/data/decorators';
 import { CLASS_NAME_PREFIX_ANIM } from '../../../../define';
 import { PoseTransformSpaceRequirement } from '../../pose-node';
-import { ccenum, Vec3 } from '../../../../../core';
+import { Vec3 } from '../../../../../core';
 import { TransformHandle } from '../../../../core/animation-handle';
 import { input } from '../../decorator/input';
 import { poseGraphNodeCategory } from '../../decorator/node';

cocos/animation/marionette/pose-graph/pose-nodes/intensity-specification.ts

@@ -1,4 +1,4 @@
-import { ccenum } from '../../../../core';
+import { ccenum } from '@base/object';
 import { ccclass, editable, range, serializable, type, visible } from '../../../../core/data/decorators';
 import { AuxiliaryCurveHandle } from '../../../core/animation-handle';
 import { Pose } from '../../../core/pose';

cocos/animation/marionette/pose-graph/pose-nodes/set-auxiliary-curve.ts

@@ -1,7 +1,7 @@
 import { EDITOR } from 'internal:constants';
+import { ccenum } from '@base/object';
 import { ccclass, editable, serializable, type } from '../../../../core/data/decorators';
 import { CLASS_NAME_PREFIX_ANIM } from '../../../define';
-import { ccenum } from '../../../../core';
 import { AuxiliaryCurveHandle } from '../../../core/animation-handle';
 import { input } from '../decorator/input';
 import { poseGraphNodeCategory } from '../decorator/node';

cocos/animation/marionette/pose-graph/pose-nodes/transform-space.ts

@@ -1,4 +1,4 @@
-import { ccenum } from '../../../../core';
+import { ccenum } from '@base/object';
 
 /**
  * @zh

cocos/animation/marionette/state-machine/state.ts

@@ -23,9 +23,10 @@
 */
 
 import { js } from '@base/utils';
+import { editorExtrasTag } from '@base/object';
 import { OwnedBy, ownerSymbol } from '../ownership';
 import type { Layer, StateMachine, TransitionInternal } from '../animation-graph';
-import { EditorExtendable, editorExtrasTag, _decorator } from '../../../core';
+import { EditorExtendable, _decorator } from '../../../core';
 import { CLASS_NAME_PREFIX_ANIM } from '../../define';
 import { StateMachineComponent } from './state-machine-component';
 import { instantiate } from '../../../serialization/instantiate';

cocos/animation/types.ts

@@ -22,7 +22,8 @@
  THE SOFTWARE.
 */
 
-import { ccenum, geometry } from '../core';
+import { ccenum } from '@base/object';
+import { geometry } from '../core';
 
 /**
  * 动画使用的循环模式。